summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-02-20 13:54:02 +0000
committerintrigeri <intrigeri@boum.org>2016-02-20 13:54:02 +0000
commit24e56611c4c817ba75ed31e621dbc28ad7ed7308 (patch)
tree4d4df8e1497d08df47b57a6483ca3d338d1d7796
parent737865249bd84bc63bb32dfcdda663810eb912cd (diff)
parent3da4263e858d218ddca7dbd8c9f4e2866f1c8452 (diff)
Merge branch 'test/10775-fragile-Evince-GTK-file-chooser' into test/10994-fragile-view-and-print-PDF
-rw-r--r--config/base_branch2
-rwxr-xr-xconfig/chroot_local-hooks/10-tbb21
-rw-r--r--config/chroot_local-hooks/11-localize_browser2
-rwxr-xr-xconfig/chroot_local-hooks/20-xul-ext_symlinks5
-rw-r--r--config/chroot_local-includes/etc/environment11
-rw-r--r--config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher1
-rwxr-xr-xconfig/chroot_local-includes/usr/bin/tor-launcher30
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-browser14
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-launcher27
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh10
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh29
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-tor-launcher29
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js)32
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css)18
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js)14
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css)48
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js18
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css1
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt2
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt32
-rw-r--r--config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch18
-rw-r--r--config/chroot_local-packageslists/tails-common.list3
-rw-r--r--debian/changelog62
-rw-r--r--features/evince.feature2
-rw-r--r--features/images/BrowserAddressBar.pngbin1611 -> 1760 bytes
-rw-r--r--features/images/BrowserDownloadDialog.pngbin2470 -> 2442 bytes
-rw-r--r--features/images/BrowserDownloadDialogSaveAsButton.pngbin1440 -> 1467 bytes
-rw-r--r--features/images/BrowserPrintToFile.pngbin0 -> 1394 bytes
-rw-r--r--features/images/EvincePrintToFile.png (renamed from features/images/PrintToFile.png)bin1365 -> 1365 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmark.pngbin2022 -> 2180 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmarkSelected.pngbin1906 -> 2042 bytes
-rw-r--r--features/images/I2PNetworkHidden.pngbin1067 -> 1216 bytes
-rw-r--r--features/images/I2PRouterConsole.pngbin3123 -> 2893 bytes
-rw-r--r--features/images/I2PSharedClientTunnels.pngbin2130 -> 2484 bytes
-rw-r--r--features/images/SupportDocumentation.pngbin2229 -> 2099 bytes
-rw-r--r--features/images/SupportDocumentationGerman.pngbin2925 -> 2629 bytes
-rw-r--r--features/images/TorBrowserBookmarkPrompt.pngbin2273 -> 2402 bytes
-rw-r--r--features/images/TorBrowserEFFBookmark.pngbin2074 -> 1918 bytes
-rw-r--r--features/images/TorBrowserNoPlugins.pngbin3339 -> 3299 bytes
-rw-r--r--features/images/TorBrowserNoScriptTemporarilyAllowDialog.pngbin1637 -> 1619 bytes
-rw-r--r--features/images/TorBrowserOkButton.pngbin598 -> 1198 bytes
-rw-r--r--features/images/TorBrowserPrintDialog.pngbin3230 -> 828 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFile.pngbin1225 -> 1298 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFileSelected.pngbin1185 -> 1277 bytes
-rw-r--r--features/images/TorBrowserSaveOutputFileSelected.pngbin1558 -> 1647 bytes
-rw-r--r--features/images/TorBrowserSavedStartupPage.pngbin1934 -> 1700 bytes
-rw-r--r--features/images/TorBrowserUnableToConnect.pngbin3964 -> 3855 bytes
-rw-r--r--features/images/TorButtonNewIdentity.pngbin1277 -> 1244 bytes
-rw-r--r--features/images/TorLauncherBridgeList.pngbin1502 -> 1568 bytes
-rw-r--r--features/images/TorLauncherBridgePrompt.pngbin6534 -> 5163 bytes
-rw-r--r--features/images/TorLauncherConfigureButton.pngbin1615 -> 1679 bytes
-rw-r--r--features/images/TorLauncherConnectingWindow.pngbin2593 -> 2572 bytes
-rw-r--r--features/images/TorLauncherFinishButton.pngbin1003 -> 1435 bytes
-rw-r--r--features/images/TorLauncherNextButton.pngbin816 -> 1100 bytes
-rw-r--r--features/images/TorLauncherYesRadioOption.pngbin1008 -> 1069 bytes
-rw-r--r--features/images/UnsafeBrowserExportBookmarksButton.pngbin1844 -> 1906 bytes
-rw-r--r--features/images/UnsafeBrowserExportBookmarksMenuEntry.pngbin1006 -> 1074 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTab.pngbin1594 -> 1563 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTabAlreadySelected.pngbin1608 -> 1570 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTabSettingsButton.pngbin1571 -> 1527 bytes
-rw-r--r--features/images/UnsafeBrowserNoAddons.pngbin1976 -> 1974 bytes
-rw-r--r--features/images/UnsafeBrowserNoProxySelected.pngbin1611 -> 1550 bytes
-rw-r--r--features/images/UnsafeBrowserProxyRefused.pngbin3314 -> 3260 bytes
-rw-r--r--features/images/UnsafeBrowserProxySettingsOkButton.pngbin1005 -> 1032 bytes
-rw-r--r--features/images/UnsafeBrowserProxySettingsWindow.pngbin2793 -> 2851 bytes
-rw-r--r--features/images/UnsafeBrowserStartPage.pngbin2978 -> 2461 bytes
-rw-r--r--features/step_definitions/apt.rb2
-rw-r--r--features/step_definitions/browser.rb17
-rw-r--r--features/step_definitions/common_steps.rb4
-rw-r--r--features/step_definitions/evince.rb6
-rw-r--r--features/step_definitions/i2p.rb2
-rw-r--r--features/step_definitions/unsafe_browser.rb4
-rw-r--r--features/step_definitions/usb.rb2
-rw-r--r--features/tor_bridges.feature1
-rw-r--r--po/ar.po10
-rw-r--r--po/az.po10
-rw-r--r--po/bg.po10
-rw-r--r--po/ca.po10
-rw-r--r--po/cs.po10
-rw-r--r--po/cy.po10
-rw-r--r--po/da.po10
-rw-r--r--po/de.po103
-rw-r--r--po/el.po10
-rw-r--r--po/en_GB.po82
-rw-r--r--po/es.po10
-rw-r--r--po/fa.po10
-rw-r--r--po/fi.po10
-rw-r--r--po/fr.po10
-rw-r--r--po/fr_CA.po10
-rw-r--r--po/he.po10
-rw-r--r--po/hr_HR.po10
-rw-r--r--po/hu.po10
-rw-r--r--po/id.po10
-rw-r--r--po/it.po10
-rw-r--r--po/ja.po10
-rw-r--r--po/km.po10
-rw-r--r--po/ko.po10
-rw-r--r--po/lv.po10
-rw-r--r--po/nb.po10
-rw-r--r--po/nl.po10
-rw-r--r--po/pl.po10
-rw-r--r--po/pt.po10
-rw-r--r--po/pt_BR.po102
-rw-r--r--po/ro.po93
-rw-r--r--po/ru.po10
-rw-r--r--po/sk.po10
-rw-r--r--po/sk_SK.po10
-rw-r--r--po/sl_SI.po10
-rw-r--r--po/sq.po10
-rw-r--r--po/sr.po10
-rw-r--r--po/sv.po10
-rw-r--r--po/tails.pot10
-rw-r--r--po/tr.po10
-rw-r--r--po/uk.po83
-rw-r--r--po/zh.po10
-rw-r--r--po/zh_CN.po10
-rw-r--r--po/zh_TW.po12
m---------submodules/jenkins-tools0
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn410
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool/archive.mdwn308
-rw-r--r--wiki/src/blueprint/Linux_containers.mdwn1
-rw-r--r--wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn127
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_01.mdwn60
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn2
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn13
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn23
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn37
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn35
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn46
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn32
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn20
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn22
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn24
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn24
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn27
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn23
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn34
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn34
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn34
-rw-r--r--wiki/src/blueprint/bootstrapping/extension/prototype.mdwn2
-rw-r--r--wiki/src/blueprint/bootstrapping/tools.fodg160
-rw-r--r--wiki/src/blueprint/bootstrapping/verification.mdwn2
-rw-r--r--wiki/src/blueprint/follow_parts_of_Redmine.mdwn15
-rw-r--r--wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn165
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn121
-rw-r--r--wiki/src/blueprint/monitor_servers.mdwn6
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn5
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn15
-rw-r--r--wiki/src/blueprint/monthly_report/report_2015_12.mdwn112
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_01.mdwn109
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_02.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_03.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_04.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_05.mdwn0
-rw-r--r--wiki/src/blueprint/network_connection.mdwn5
-rw-r--r--wiki/src/blueprint/persistent_Tor_state.mdwn6
-rw-r--r--wiki/src/blueprint/replace_Pidgin.mdwn13
-rw-r--r--wiki/src/blueprint/report_2015_09.mdwn96
-rw-r--r--wiki/src/blueprint/report_2015_10.mdwn67
-rw-r--r--wiki/src/blueprint/report_2015_11.mdwn75
-rw-r--r--wiki/src/blueprint/report_2015_12.mdwn75
-rw-r--r--wiki/src/blueprint/website_homepage.mdwn2
-rw-r--r--wiki/src/contribute.de.po6
-rw-r--r--wiki/src/contribute.fa.po9
-rw-r--r--wiki/src/contribute.fr.po6
-rw-r--r--wiki/src/contribute.mdwn1
-rw-r--r--wiki/src/contribute.pt.po6
-rw-r--r--wiki/src/contribute/APT_repository.mdwn22
-rw-r--r--wiki/src/contribute/build.mdwn16
-rw-r--r--wiki/src/contribute/calendar.mdwn30
-rw-r--r--wiki/src/contribute/chat.mdwn12
-rw-r--r--wiki/src/contribute/design/I2P_Browser.mdwn2
-rw-r--r--wiki/src/contribute/design/Tor_enforcement/DNS.mdwn4
-rw-r--r--wiki/src/contribute/design/Unsafe_Browser.mdwn2
-rw-r--r--wiki/src/contribute/how/debian.mdwn22
-rw-r--r--wiki/src/contribute/how/donate.de.po8
-rw-r--r--wiki/src/contribute/how/donate.fa.po8
-rw-r--r--wiki/src/contribute/how/donate.fr.po8
-rw-r--r--wiki/src/contribute/how/donate.mdwn3
-rw-r--r--wiki/src/contribute/how/donate.pt.po8
-rw-r--r--wiki/src/contribute/how/translate.mdwn1
-rw-r--r--wiki/src/contribute/how/translate/team/fa.mdwn4
-rw-r--r--wiki/src/contribute/l10n_tricks/core_po_files.txt2
-rw-r--r--wiki/src/contribute/low-hanging_fruit_sessions.mdwn22
-rw-r--r--wiki/src/contribute/meetings.mdwn8
-rw-r--r--wiki/src/contribute/meetings/201602.mdwn62
-rw-r--r--wiki/src/contribute/release_process.mdwn82
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator.mdwn1
-rw-r--r--wiki/src/contribute/release_process/tails-installer.mdwn49
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn20
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn12
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2016_01.mdwn276
-rw-r--r--wiki/src/contribute/talk.html5
-rw-r--r--wiki/src/doc/about.index.de.po17
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po56
-rw-r--r--wiki/src/doc/anonymous_internet.index.fa.po73
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po80
-rw-r--r--wiki/src/doc/anonymous_internet.index.mdwn4
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po83
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn49
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po74
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.de.po13
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.fa.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.fr.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po47
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po19
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po19
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po19
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.de.po196
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fa.po261
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fr.po191
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.mdwn58
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.pt.po175
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/networkmanager.pngbin26026 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.de.po170
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.fa.po167
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.fr.po172
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.mdwn53
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.pt.po174
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia/right-click_menu.pngbin20492 -> 16297 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.de.po29
-rw-r--r--wiki/src/doc/encryption_and_privacy/checksums.de.po12
-rw-r--r--wiki/src/doc/encryption_and_privacy/checksums.fa.po50
-rw-r--r--wiki/src/doc/encryption_and_privacy/checksums.fr.po12
-rw-r--r--wiki/src/doc/encryption_and_privacy/checksums.mdwn4
-rw-r--r--wiki/src/doc/encryption_and_privacy/checksums.pt.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po386
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po399
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po397
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn145
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po197
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.pngbin27208 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.pngbin25926 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.pngbin18085 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.pngbin17239 -> 13205 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.pngbin33320 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.pngbin34762 -> 17015 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/nautilus_encrypted.pngbin0 -> 52269 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.pngbin55305 -> 47841 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.pngbin52178 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.pngbin22813 -> 15196 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.de.po56
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.de.po60
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po114
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po133
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn49
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po60
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.pngbin37206 -> 25925 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.de.po41
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fa.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fr.po18
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.pt.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn12
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po18
-rw-r--r--wiki/src/doc/first_steps.index.de.po112
-rw-r--r--wiki/src/doc/first_steps.index.fa.po30
-rw-r--r--wiki/src/doc/first_steps.index.fr.po30
-rw-r--r--wiki/src/doc/first_steps.index.mdwn18
-rw-r--r--wiki/src/doc/first_steps.index.pt.po30
-rw-r--r--wiki/src/doc/first_steps/accessibility.de.po169
-rw-r--r--wiki/src/doc/first_steps/accessibility.fa.po193
-rw-r--r--wiki/src/doc/first_steps/accessibility.fr.po176
-rw-r--r--wiki/src/doc/first_steps/accessibility.mdwn54
-rw-r--r--wiki/src/doc/first_steps/accessibility.pt.po169
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.de.po14
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fa.po110
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fr.po14
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.pt.po14
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po779
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po718
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po774
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn12
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po764
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.pngbin4570 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.de.po64
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.fa.po130
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.fr.po120
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.mdwn44
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.pt.po116
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.de.po132
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.fa.po144
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.fr.po133
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.mdwn56
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.pt.po88
-rw-r--r--wiki/src/doc/first_steps/persistence/claws-mail.pngbin4589 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.de.po162
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fa.po138
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fr.po170
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.mdwn54
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.pt.po176
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.de.po4
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fa.po85
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fr.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.mdwn2
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.pt.po215
-rw-r--r--wiki/src/doc/first_steps/reset/linux.de.po106
-rw-r--r--wiki/src/doc/first_steps/reset/linux.fa.po95
-rw-r--r--wiki/src/doc/first_steps/reset/linux.fr.po104
-rw-r--r--wiki/src/doc/first_steps/reset/linux.mdwn45
-rw-r--r--wiki/src/doc/first_steps/reset/linux.pt.po103
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fa.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fr.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn11
-rw-r--r--wiki/src/doc/first_steps/reset/mac.pt.po20
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.de.po12
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fa.po65
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po16
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.pt.po12
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po169
-rw-r--r--wiki/src/doc/first_steps/upgrade.fa.po139
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po170
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn70
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po170
-rw-r--r--wiki/src/doc/first_steps/upgrade/release_notes.inline.de.po40
-rw-r--r--wiki/src/doc/first_steps/upgrade/release_notes.inline.fa.po40
-rw-r--r--wiki/src/doc/first_steps/upgrade/release_notes.inline.fr.po40
-rw-r--r--wiki/src/doc/first_steps/upgrade/release_notes.inline.html17
-rw-r--r--wiki/src/doc/first_steps/upgrade/release_notes.inline.pt.po40
-rw-r--r--wiki/src/doc/get.index.de.po48
-rw-r--r--wiki/src/doc/get.index.fa.po42
-rw-r--r--wiki/src/doc/get.index.fr.po20
-rw-r--r--wiki/src/doc/get.index.mdwn8
-rw-r--r--wiki/src/doc/get.index.pt.po20
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po15
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po15
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po11
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.html4
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.pt.po11
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.de.po42
-rw-r--r--wiki/src/doc/sensitive_documents/metadata.de.po27
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.de.po37
-rw-r--r--wiki/src/doc/sensitive_documents/persistence.de.po19
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.de.po45
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po25
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po15
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.pt.po5
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.de.po39
-rw-r--r--wiki/src/getting_started.de.po9
-rw-r--r--wiki/src/getting_started.fa.po40
-rw-r--r--wiki/src/getting_started.fr.po9
-rw-r--r--wiki/src/getting_started.mdwn2
-rw-r--r--wiki/src/getting_started.pt.po9
-rw-r--r--wiki/src/inc/release_notes/1.5.de.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.fa.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.fr.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.mdwn4
-rw-r--r--wiki/src/inc/release_notes/1.5.pt.po10
-rw-r--r--wiki/src/inc/release_notes/1.8.1.fr.po9
-rw-r--r--wiki/src/inc/release_notes/2.0.1.de.po39
-rw-r--r--wiki/src/inc/release_notes/2.0.1.fa.po39
-rw-r--r--wiki/src/inc/release_notes/2.0.1.fr.po39
-rw-r--r--wiki/src/inc/release_notes/2.0.1.mdwn7
-rw-r--r--wiki/src/inc/release_notes/2.0.1.pt.po39
-rw-r--r--wiki/src/inc/release_notes/2.0.de.po188
-rw-r--r--wiki/src/inc/release_notes/2.0.fa.po149
-rw-r--r--wiki/src/inc/release_notes/2.0.fr.po149
-rw-r--r--wiki/src/inc/release_notes/2.0.mdwn64
-rw-r--r--wiki/src/inc/release_notes/2.0.pt.po149
-rw-r--r--wiki/src/inc/release_notes/2.0/activities_overview.pngbin0 -> 54228 bytes
-rw-r--r--wiki/src/inc/release_notes/2.0/applications_menu.pngbin0 -> 18322 bytes
-rw-r--r--wiki/src/inc/stable_i386_date.de.po4
-rw-r--r--wiki/src/inc/stable_i386_date.fa.po4
-rw-r--r--wiki/src/inc/stable_i386_date.fr.po4
-rw-r--r--wiki/src/inc/stable_i386_date.html2
-rw-r--r--wiki/src/inc/stable_i386_date.pt.po4
-rw-r--r--wiki/src/inc/stable_i386_gpg_signature_output.html6
-rw-r--r--wiki/src/inc/stable_i386_gpg_verify.html2
-rw-r--r--wiki/src/inc/stable_i386_hash.html2
-rw-r--r--wiki/src/inc/stable_i386_iso_sig_url.html2
-rw-r--r--wiki/src/inc/stable_i386_iso_size.html2
-rw-r--r--wiki/src/inc/stable_i386_iso_url.html2
-rw-r--r--wiki/src/inc/stable_i386_release_notes.de.po4
-rw-r--r--wiki/src/inc/stable_i386_release_notes.fa.po6
-rw-r--r--wiki/src/inc/stable_i386_release_notes.fr.po4
-rw-r--r--wiki/src/inc/stable_i386_release_notes.html2
-rw-r--r--wiki/src/inc/stable_i386_release_notes.pt.po4
-rw-r--r--wiki/src/inc/stable_i386_torrent_sig_url.html2
-rw-r--r--wiki/src/inc/stable_i386_torrent_url.html2
-rw-r--r--wiki/src/inc/stable_i386_version.html2
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/install.de.po54
-rw-r--r--wiki/src/install.fa.po34
-rw-r--r--wiki/src/install.fr.po33
-rw-r--r--wiki/src/install.html17
-rw-r--r--wiki/src/install.pt.po33
-rw-r--r--wiki/src/install/clone.de.po7
-rw-r--r--wiki/src/install/clone.fa.po39
-rw-r--r--wiki/src/install/clone.fr.po7
-rw-r--r--wiki/src/install/clone.mdwn2
-rw-r--r--wiki/src/install/clone.pt.po7
-rw-r--r--wiki/src/install/debian.de.po20
-rw-r--r--wiki/src/install/debian.fa.po20
-rw-r--r--wiki/src/install/debian.fr.po20
-rw-r--r--wiki/src/install/debian.html8
-rw-r--r--wiki/src/install/debian.pt.po20
-rw-r--r--wiki/src/install/debian/clone/overview.de.po16
-rw-r--r--wiki/src/install/debian/clone/overview.fa.po13
-rw-r--r--wiki/src/install/debian/clone/overview.fr.po16
-rw-r--r--wiki/src/install/debian/clone/overview.html2
-rw-r--r--wiki/src/install/debian/clone/overview.pt.po16
-rw-r--r--wiki/src/install/debian/usb.de.po7
-rw-r--r--wiki/src/install/debian/usb.fa.po7
-rw-r--r--wiki/src/install/debian/usb.fr.po7
-rw-r--r--wiki/src/install/debian/usb.mdwn2
-rw-r--r--wiki/src/install/debian/usb.pt.po7
-rw-r--r--wiki/src/install/debian/usb/overview.de.po16
-rw-r--r--wiki/src/install/debian/usb/overview.fa.po16
-rw-r--r--wiki/src/install/debian/usb/overview.fr.po16
-rw-r--r--wiki/src/install/debian/usb/overview.html2
-rw-r--r--wiki/src/install/debian/usb/overview.pt.po16
-rw-r--r--wiki/src/install/download.de.po7
-rw-r--r--wiki/src/install/download.fa.po7
-rw-r--r--wiki/src/install/download.fr.po7
-rw-r--r--wiki/src/install/download.mdwn2
-rw-r--r--wiki/src/install/download.pt.po7
-rw-r--r--wiki/src/install/dvd.de.po7
-rw-r--r--wiki/src/install/dvd.fa.po7
-rw-r--r--wiki/src/install/dvd.fr.po7
-rw-r--r--wiki/src/install/dvd.mdwn2
-rw-r--r--wiki/src/install/dvd.pt.po7
-rw-r--r--wiki/src/install/expert/usb.de.po9
-rw-r--r--wiki/src/install/expert/usb.fa.po9
-rw-r--r--wiki/src/install/expert/usb.fr.po9
-rw-r--r--wiki/src/install/expert/usb.mdwn4
-rw-r--r--wiki/src/install/expert/usb.pt.po9
-rw-r--r--wiki/src/install/expert/usb/overview.de.po17
-rw-r--r--wiki/src/install/expert/usb/overview.fa.po17
-rw-r--r--wiki/src/install/expert/usb/overview.fr.po17
-rw-r--r--wiki/src/install/expert/usb/overview.html4
-rw-r--r--wiki/src/install/expert/usb/overview.pt.po17
-rw-r--r--wiki/src/install/inc/js/dave.js9
-rw-r--r--wiki/src/install/inc/overview.de.po4
-rw-r--r--wiki/src/install/inc/overview.fa.po4
-rw-r--r--wiki/src/install/inc/overview.fr.po4
-rw-r--r--wiki/src/install/inc/overview.pt.po4
-rw-r--r--wiki/src/install/inc/router/clone.de.po27
-rw-r--r--wiki/src/install/inc/router/why_two.inline.de.po30
-rw-r--r--wiki/src/install/inc/screenshots/desktop.pngbin39652 -> 30054 bytes
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po24
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po24
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po24
-rw-r--r--wiki/src/install/inc/steps/download.inline.html6
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po24
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn11
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po18
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po46
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po46
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po46
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn34
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po46
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.de.po8
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.fa.po8
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.fr.po8
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.mdwn6
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.pt.po8
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po9
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po9
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po9
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn6
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po9
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.de.po9
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fa.po9
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po9
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn3
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.pt.po9
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css4
-rw-r--r--wiki/src/install/inc/stylesheets/expert.css4
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css70
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.de.po16
-rw-r--r--wiki/src/install/linux.de.po59
-rw-r--r--wiki/src/install/linux.fa.po18
-rw-r--r--wiki/src/install/linux.fr.po18
-rw-r--r--wiki/src/install/linux.html4
-rw-r--r--wiki/src/install/linux.pt.po18
-rw-r--r--wiki/src/install/linux/clone/overview.de.po16
-rw-r--r--wiki/src/install/linux/clone/overview.fa.po16
-rw-r--r--wiki/src/install/linux/clone/overview.fr.po16
-rw-r--r--wiki/src/install/linux/clone/overview.html2
-rw-r--r--wiki/src/install/linux/clone/overview.pt.po16
-rw-r--r--wiki/src/install/linux/usb.de.po11
-rw-r--r--wiki/src/install/linux/usb.fa.po11
-rw-r--r--wiki/src/install/linux/usb.fr.po11
-rw-r--r--wiki/src/install/linux/usb.mdwn4
-rw-r--r--wiki/src/install/linux/usb.pt.po11
-rw-r--r--wiki/src/install/linux/usb/overview.de.po16
-rw-r--r--wiki/src/install/linux/usb/overview.fa.po16
-rw-r--r--wiki/src/install/linux/usb/overview.fr.po16
-rw-r--r--wiki/src/install/linux/usb/overview.html2
-rw-r--r--wiki/src/install/linux/usb/overview.pt.po16
-rw-r--r--wiki/src/install/mac.de.po14
-rw-r--r--wiki/src/install/mac.fa.po14
-rw-r--r--wiki/src/install/mac.fr.po14
-rw-r--r--wiki/src/install/mac.html2
-rw-r--r--wiki/src/install/mac.pt.po14
-rw-r--r--wiki/src/install/mac/clone.de.po7
-rw-r--r--wiki/src/install/mac/clone.fa.po7
-rw-r--r--wiki/src/install/mac/clone.fr.po7
-rw-r--r--wiki/src/install/mac/clone.mdwn2
-rw-r--r--wiki/src/install/mac/clone.pt.po7
-rw-r--r--wiki/src/install/mac/clone/overview.de.po16
-rw-r--r--wiki/src/install/mac/clone/overview.fa.po13
-rw-r--r--wiki/src/install/mac/clone/overview.fr.po16
-rw-r--r--wiki/src/install/mac/clone/overview.html2
-rw-r--r--wiki/src/install/mac/clone/overview.pt.po16
-rw-r--r--wiki/src/install/mac/dvd.de.po7
-rw-r--r--wiki/src/install/mac/dvd.fa.po7
-rw-r--r--wiki/src/install/mac/dvd.fr.po7
-rw-r--r--wiki/src/install/mac/dvd.mdwn2
-rw-r--r--wiki/src/install/mac/dvd.pt.po7
-rw-r--r--wiki/src/install/mac/dvd/overview.de.po17
-rw-r--r--wiki/src/install/mac/dvd/overview.fa.po17
-rw-r--r--wiki/src/install/mac/dvd/overview.fr.po17
-rw-r--r--wiki/src/install/mac/dvd/overview.html2
-rw-r--r--wiki/src/install/mac/dvd/overview.pt.po17
-rw-r--r--wiki/src/install/mac/usb.de.po7
-rw-r--r--wiki/src/install/mac/usb.fa.po7
-rw-r--r--wiki/src/install/mac/usb.fr.po7
-rw-r--r--wiki/src/install/mac/usb.mdwn2
-rw-r--r--wiki/src/install/mac/usb.pt.po7
-rw-r--r--wiki/src/install/mac/usb/overview.de.po22
-rw-r--r--wiki/src/install/mac/usb/overview.fa.po22
-rw-r--r--wiki/src/install/mac/usb/overview.fr.po22
-rw-r--r--wiki/src/install/mac/usb/overview.html2
-rw-r--r--wiki/src/install/mac/usb/overview.pt.po22
-rw-r--r--wiki/src/install/os.de.po49
-rw-r--r--wiki/src/install/os.fa.po13
-rw-r--r--wiki/src/install/os.fr.po13
-rw-r--r--wiki/src/install/os.html5
-rw-r--r--wiki/src/install/os.pt.po13
-rw-r--r--wiki/src/install/v1/Tails/i386/stable/latest.yml6
-rw-r--r--wiki/src/install/vm.de.po7
-rw-r--r--wiki/src/install/vm.fa.po7
-rw-r--r--wiki/src/install/vm.fr.po7
-rw-r--r--wiki/src/install/vm.mdwn2
-rw-r--r--wiki/src/install/vm.pt.po7
-rw-r--r--wiki/src/install/win.de.po18
-rw-r--r--wiki/src/install/win.fa.po18
-rw-r--r--wiki/src/install/win.fr.po18
-rw-r--r--wiki/src/install/win.html4
-rw-r--r--wiki/src/install/win.pt.po18
-rw-r--r--wiki/src/install/win/clone/overview.de.po26
-rw-r--r--wiki/src/install/win/clone/overview.fa.po13
-rw-r--r--wiki/src/install/win/clone/overview.fr.po16
-rw-r--r--wiki/src/install/win/clone/overview.html2
-rw-r--r--wiki/src/install/win/clone/overview.pt.po16
-rw-r--r--wiki/src/install/win/usb.de.po10
-rw-r--r--wiki/src/install/win/usb.fa.po7
-rw-r--r--wiki/src/install/win/usb.fr.po7
-rw-r--r--wiki/src/install/win/usb.mdwn2
-rw-r--r--wiki/src/install/win/usb.pt.po7
-rw-r--r--wiki/src/install/win/usb/overview.de.po25
-rw-r--r--wiki/src/install/win/usb/overview.fa.po16
-rw-r--r--wiki/src/install/win/usb/overview.fr.po16
-rw-r--r--wiki/src/install/win/usb/overview.html2
-rw-r--r--wiki/src/install/win/usb/overview.pt.po16
-rw-r--r--wiki/src/lib/go-down.pngbin0 -> 253 bytes
-rw-r--r--wiki/src/lib/list-add.pngbin0 -> 167 bytes
-rw-r--r--wiki/src/lib/media-playback-start.pngbin0 -> 246 bytes
-rw-r--r--wiki/src/lib/menu.png (renamed from wiki/src/doc/anonymous_internet/icedove/menu.png)bin329 -> 289 bytes
-rw-r--r--wiki/src/lib/open-menu.pngbin0 -> 181 bytes
-rw-r--r--wiki/src/lib/preferences-desktop-accessibility.pngbin0 -> 446 bytes
-rw-r--r--wiki/src/lib/spip_out.gifbin108 -> 0 bytes
-rw-r--r--wiki/src/lib/system-run.pngbin0 -> 514 bytes
-rw-r--r--wiki/src/lib/unlock.pngbin0 -> 281 bytes
-rw-r--r--wiki/src/local.css22
-rw-r--r--wiki/src/local.rtl.css11
-rw-r--r--wiki/src/news/report_2015_08.de.po328
-rw-r--r--wiki/src/news/report_2015_08.fa.po328
-rw-r--r--wiki/src/news/report_2015_08.fr.po328
-rw-r--r--wiki/src/news/report_2015_08.mdwn (renamed from wiki/src/blueprint/report_2015_08.mdwn)48
-rw-r--r--wiki/src/news/report_2015_08.pt.po328
-rw-r--r--wiki/src/news/signing_key_transition.de.po9
-rw-r--r--wiki/src/news/signing_key_transition.fa.po94
-rw-r--r--wiki/src/news/signing_key_transition.fr.po19
-rw-r--r--wiki/src/news/signing_key_transition.mdwn7
-rw-r--r--wiki/src/news/signing_key_transition.pt.po9
-rw-r--r--wiki/src/news/version_1.5.de.po25
-rw-r--r--wiki/src/news/version_1.5.fa.po25
-rw-r--r--wiki/src/news/version_1.5.fr.po25
-rw-r--r--wiki/src/news/version_1.5.mdwn4
-rw-r--r--wiki/src/news/version_1.5.pt.po25
-rw-r--r--wiki/src/news/version_1.8.1.fr.po52
-rw-r--r--wiki/src/news/version_2.0.1.de.po98
-rw-r--r--wiki/src/news/version_2.0.1.fa.po98
-rw-r--r--wiki/src/news/version_2.0.1.fr.po98
-rw-r--r--wiki/src/news/version_2.0.1.mdwn35
-rw-r--r--wiki/src/news/version_2.0.1.pt.po98
-rw-r--r--wiki/src/news/version_2.0.de.po196
-rw-r--r--wiki/src/news/version_2.0.fa.po162
-rw-r--r--wiki/src/news/version_2.0.fr.po162
-rw-r--r--wiki/src/news/version_2.0.mdwn67
-rw-r--r--wiki/src/news/version_2.0.pt.po162
-rw-r--r--wiki/src/news/version_2.0/assistant.pngbin0 -> 86975 bytes
-rw-r--r--wiki/src/press/media_appearances_2016.de.po24
-rw-r--r--wiki/src/press/media_appearances_2016.fa.po24
-rw-r--r--wiki/src/press/media_appearances_2016.fr.po24
-rw-r--r--wiki/src/press/media_appearances_2016.mdwn8
-rw-r--r--wiki/src/press/media_appearances_2016.pt.po24
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.7.fr.po48
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.de.po88
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.fa.po84
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.fr.po84
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.mdwn21
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.pt.po84
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.fr.po32
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.0.de.po71
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.0.fa.po71
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.0.fr.po71
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.0.mdwn18
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.0.pt.po71
-rw-r--r--wiki/src/sidebar.de.po20
-rw-r--r--wiki/src/sidebar.fa.po28
-rw-r--r--wiki/src/sidebar.fr.po14
-rw-r--r--wiki/src/sidebar.mdwn4
-rw-r--r--wiki/src/sidebar.pt.po20
-rw-r--r--wiki/src/support/known_issues.de.po117
-rw-r--r--wiki/src/support/known_issues.fa.po211
-rw-r--r--wiki/src/support/known_issues.fr.po197
-rw-r--r--wiki/src/support/known_issues.mdwn62
-rw-r--r--wiki/src/support/known_issues.pt.po145
-rw-r--r--wiki/src/support/learn.de.po37
-rw-r--r--wiki/src/support/learn.fa.po37
-rw-r--r--wiki/src/support/learn.fr.po45
-rw-r--r--wiki/src/support/learn.mdwn18
-rw-r--r--wiki/src/support/learn.pt.po37
-rw-r--r--wiki/src/torrents/files/tails-i386-1.8.2.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.8.2.packages1609
-rw-r--r--wiki/src/torrents/files/tails-i386-1.8.2.torrentbin80720 -> 0 bytes
-rw-r--r--wiki/src/torrents/files/tails-i386-1.8.2.torrent.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0.1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0.1.packages1832
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0.1.torrentbin0 -> 87000 bytes
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0.1.torrent.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0~beta1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0~rc1.iso.sig16
-rw-r--r--wiki/src/upgrade.de.po39
-rw-r--r--wiki/src/upgrade.fa.po39
-rw-r--r--wiki/src/upgrade.fr.po39
-rw-r--r--wiki/src/upgrade.html21
-rw-r--r--wiki/src/upgrade.pt.po39
-rw-r--r--wiki/src/upgrade/clone.de.po7
-rw-r--r--wiki/src/upgrade/clone.fa.po7
-rw-r--r--wiki/src/upgrade/clone.fr.po7
-rw-r--r--wiki/src/upgrade/clone.mdwn2
-rw-r--r--wiki/src/upgrade/clone.pt.po7
-rw-r--r--wiki/src/upgrade/clone/overview.de.po17
-rw-r--r--wiki/src/upgrade/clone/overview.fa.po17
-rw-r--r--wiki/src/upgrade/clone/overview.fr.po17
-rw-r--r--wiki/src/upgrade/clone/overview.html2
-rw-r--r--wiki/src/upgrade/clone/overview.pt.po17
-rw-r--r--wiki/src/upgrade/tails.de.po7
-rw-r--r--wiki/src/upgrade/tails.fa.po7
-rw-r--r--wiki/src/upgrade/tails.fr.po7
-rw-r--r--wiki/src/upgrade/tails.mdwn2
-rw-r--r--wiki/src/upgrade/tails.pt.po7
-rw-r--r--wiki/src/upgrade/tails/overview.de.po17
-rw-r--r--wiki/src/upgrade/tails/overview.fa.po17
-rw-r--r--wiki/src/upgrade/tails/overview.fr.po17
-rw-r--r--wiki/src/upgrade/tails/overview.html2
-rw-r--r--wiki/src/upgrade/tails/overview.pt.po17
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0/i386/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0~rc1/i386/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0~rc1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2~rc1/i386/alpha/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2~rc1/i386/stable/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2~rc1/i386/stable/upgrades.yml.pgp16
701 files changed, 19207 insertions, 10516 deletions
diff --git a/config/base_branch b/config/base_branch
index d64531f..2bf5ad0 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-devel
+stable
diff --git a/config/chroot_local-hooks/10-tbb b/config/chroot_local-hooks/10-tbb
index 9c4a008..ac47e06 100755
--- a/config/chroot_local-hooks/10-tbb
+++ b/config/chroot_local-hooks/10-tbb
@@ -4,12 +4,13 @@ set -eu
echo "Install the Tor Browser"
-# Import the TBB_INSTALL, TBB_PROFILE and TBB_EXT variables, which
-# contains the paths we will split TBB's actual browser (binaries
-# etc), user data and extension into. While this differs from how the
-# TBB organizes the files, the end result will be the same, and it's
-# practical since when creating a new browser profile we can simply
-# copy the profile directory without duplicating all extensions.
+# Import the TBB_INSTALL, TBB_PROFILE, TBB_EXT and
+# TOR_LAUNCHER_INSTALL variables, which contains the paths we will
+# split TBB's actual browser (binaries etc), user data and extension
+# into. While this differs from how the TBB organizes the files, the
+# end result will be the same, and it's practical since when creating
+# a new browser profile we can simply copy the profile directory
+# without duplicating all extensions.
. /usr/local/lib/tails-shell-library/tor-browser.sh
download_and_verify_files() {
@@ -70,11 +71,11 @@ install_tor_browser() {
# profile but we want to keep it as a standalone application
# when Tails is started in "bridge mode".
torlauncher_xpi_path="${prep}/TorBrowser/Data/Browser/profile.default/extensions/tor-launcher@torproject.org.xpi"
- 7z x -o'/usr/share/tor-launcher-standalone' "${torlauncher_xpi_path}"
+ 7z x -o"${TOR_LAUNCHER_INSTALL}" "${torlauncher_xpi_path}"
torlauncher_version="$(sed -n \
's,^ <em:version>\([0-9\.]\+\)</em:version>,\1,p' \
- '/usr/share/tor-launcher-standalone/install.rdf')"
- cat > '/usr/share/tor-launcher-standalone/application.ini' << EOF
+ "${TOR_LAUNCHER_INSTALL}/install.rdf")"
+ cat > "${TOR_LAUNCHER_INSTALL}/application.ini" << EOF
[App]
Vendor=TorProject
Name=TorLauncher
@@ -89,7 +90,7 @@ MaxVersion=*.*.*
[Shell]
Icon=icon.png
EOF
- chmod -R a+rX '/usr/share/tor-launcher-standalone'
+ chmod -R a+rX "${TOR_LAUNCHER_INSTALL}"
rm "${torlauncher_xpi_path}"
# The Tor Browser will fail, complaining about an incomplete profile,
diff --git a/config/chroot_local-hooks/11-localize_browser b/config/chroot_local-hooks/11-localize_browser
index e4a1c30..9b3cf78 100644
--- a/config/chroot_local-hooks/11-localize_browser
+++ b/config/chroot_local-hooks/11-localize_browser
@@ -86,7 +86,7 @@ while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG STARTPAGE_LANG STARTPAGE
# mix them up.
CAPITALIZED_LANG_CODE="$(echo "${LANG_CODE}" | tr 'a-z' 'A-Z')"
LOCALIZED_WIKIPEDIA_ICON_PATH="/tmp/wikipedia-icon-${LANG_CODE}.png"
- WIKIPEDIA_SEARCH_ICON_BASE64_PATH="#{LOCALIZED_WIKIPEDIA_ICON_PATH}.base64"
+ WIKIPEDIA_SEARCH_ICON_BASE64_PATH="${LOCALIZED_WIKIPEDIA_ICON_PATH}.base64"
WIKIPEDIA_ICON_TEMPLATE="${BROWSER_LOCALIZATION_DIR}/Wikipedia-icon.png"
convert "${WIKIPEDIA_ICON_TEMPLATE}" \
-gravity SouthEast -pointsize 130 -font Liberation-Sans-Bold \
diff --git a/config/chroot_local-hooks/20-xul-ext_symlinks b/config/chroot_local-hooks/20-xul-ext_symlinks
index 6428394..68a3de4 100755
--- a/config/chroot_local-hooks/20-xul-ext_symlinks
+++ b/config/chroot_local-hooks/20-xul-ext_symlinks
@@ -4,5 +4,8 @@ set -e
echo "Creating prefs override for Tor Launcher"
+# Import the TOR_LAUNCHER_INSTALL variable.
+. /usr/local/lib/tails-shell-library/tor-browser.sh
+
ln -s /etc/xul-ext/tor-launcher.js \
- /usr/share/tor-launcher-standalone/defaults/preferences/000system.js
+ "${TOR_LAUNCHER_INSTALL}/defaults/preferences/000system.js"
diff --git a/config/chroot_local-includes/etc/environment b/config/chroot_local-includes/etc/environment
index 2667880..8c99aff 100644
--- a/config/chroot_local-includes/etc/environment
+++ b/config/chroot_local-includes/etc/environment
@@ -1,16 +1,5 @@
SOCKS_SERVER=127.0.0.1:9050
SOCKS5_SERVER=127.0.0.1:9050
-# Allow Torbutton access to the control port filter (for new identity).
-# Setting a password is required, otherwise Torbutton attempts to
-# read the authentication cookie file instead, which fails.
-TOR_CONTROL_HOST='127.0.0.1'
-TOR_CONTROL_PORT='9052'
-TOR_CONTROL_PASSWD='passwd'
-# Hide Torbutton's "Tor Network Settings..." context menu entry since
-# it doesn't work in Tails, and we deal with those configurations
-# strictly through Tor Launcher.
-TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
-
# Port that the monkeysphere validation agent listens on
MSVA_PORT='6136'
diff --git a/config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher b/config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher
deleted file mode 100644
index 373602b..0000000
--- a/config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher
+++ /dev/null
@@ -1 +0,0 @@
-Defaults!/usr/bin/tor-launcher always_set_home,env_keep+="TOR_CONFIGURE_ONLY TOR_CONTROL_PORT TOR_CONTROL_COOKIE_AUTH_FILE TOR_FORCE_NET_CONFIG TOR_HIDE_BROWSER_LOGO"
diff --git a/config/chroot_local-includes/usr/bin/tor-launcher b/config/chroot_local-includes/usr/bin/tor-launcher
deleted file mode 100755
index 0e48ffd..0000000
--- a/config/chroot_local-includes/usr/bin/tor-launcher
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Import exec_firefox() and configure_best_tor_launcher_locale()
-. /usr/local/lib/tails-shell-library/tor-browser.sh
-
-# The Tor Browser hardcodes the default profile dir to ../.. from the
-# folder storing the application.ini file supplied via -app. Sadly,
-# -profile doesn't work together with -app. Therefore we copy the
-# whole Tor Launcher application (just ~350 KB) into the user's home
-# so we can get the profile directory in a sane place.
-if [ ! -e "${HOME}"/.tor-launcher ]; then
- mkdir -p "${HOME}"/.tor-launcher
- cp -r /usr/share/tor-launcher-standalone "${HOME}"/.tor-launcher/tor-launcher-standalone
- mkdir -p "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/
- cat << EOF > "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profiles.ini
-[General]
-StartWithLastProfile=1
-
-[Profile0]
-Name=default
-IsRelative=1
-Path=profile.default
-EOF
- mkdir -p "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profile.default/preferences
- configure_best_tor_launcher_locale "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profile.default
-fi
-
-exec_unconfined_firefox -app "${HOME}"/.tor-launcher/tor-launcher-standalone/application.ini
diff --git a/config/chroot_local-includes/usr/local/bin/tor-browser b/config/chroot_local-includes/usr/local/bin/tor-browser
index 1abc434..4f755db 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-browser
+++ b/config/chroot_local-includes/usr/local/bin/tor-browser
@@ -20,6 +20,18 @@ PROFILE="${HOME}/.tor-browser/profile.default"
# Import exec_firefox() and configure_best_tor_browser_locale()
. /usr/local/lib/tails-shell-library/tor-browser.sh
+# Allow Torbutton access to the control port filter (for new identity).
+# Setting a password is required, otherwise Torbutton attempts to
+# read the authentication cookie file instead, which fails.
+export TOR_CONTROL_HOST='127.0.0.1'
+export TOR_CONTROL_PORT='9052'
+export TOR_CONTROL_PASSWD='passwd'
+# Hide Torbutton's "Tor Network Settings..." context menu entry since
+# it doesn't work in Tails, and we deal with those configurations
+# strictly through Tor Launcher.
+export TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
+
+
ask_for_confirmation() {
# Skip dialog if user is already running Tor Browser:
if pgrep -u amnesia -f "${TBB_INSTALL}/firefox" ; then
@@ -55,8 +67,6 @@ start_browser() {
# not enough to simply set intl.locale.matchOS to true.
configure_best_tor_browser_locale "${PROFILE}"
- unset SESSION_MANAGER
-
exec_firefox -allow-remote --class "Tor Browser" -profile "${PROFILE}" "${@}"
}
diff --git a/config/chroot_local-includes/usr/local/bin/tor-launcher b/config/chroot_local-includes/usr/local/bin/tor-launcher
new file mode 100755
index 0000000..fb4a8a9
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/tor-launcher
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+# Import the TOR_LAUNCHER_INSTALL variable, and exec_unconfined_firefox()
+# and configure_best_tor_launcher_locale()
+. /usr/local/lib/tails-shell-library/tor-browser.sh
+
+unset TOR_CONTROL_PASSWD
+unset TOR_FORCE_NET_CONFIG
+export TOR_CONFIGURE_ONLY=1
+export TOR_CONTROL_PORT=9051
+export TOR_CONTROL_COOKIE_AUTH_FILE=/var/run/tor/control.authcookie
+export TOR_HIDE_BROWSER_LOGO=1
+if echo "$@" | grep -qw -- --force-net-config; then
+ export TOR_FORCE_NET_CONFIG=1
+fi
+
+PROFILE="${HOME}/.tor-launcher/profile.default"
+if [ ! -d "${PROFILE}" ]; then
+ mkdir -p "${PROFILE}"
+ configure_best_tor_launcher_locale "${PROFILE}"
+fi
+
+exec_unconfined_firefox \
+ -app "${TOR_LAUNCHER_INSTALL}/application.ini" \
+ -profile "${PROFILE}"
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
index a9eb872..3d3a515 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
@@ -132,8 +132,10 @@ configure_chroot_browser_profile () {
# Set preferences
local browser_prefs="${browser_profile}/preferences/prefs.js"
+ local chroot_browser_config="/usr/share/tails/chroot-browsers"
mkdir -p "$(dirname "${browser_prefs}")"
- cp "/usr/share/tails/${browser_name}/prefs.js" "${browser_prefs}"
+ cat "${chroot_browser_config}/common/prefs.js" \
+ "${chroot_browser_config}/${browser_name}/prefs.js" > "${browser_prefs}"
# Set browser home page to something that explains what's going on
if [ -n "${home_page}" ]; then
@@ -145,12 +147,14 @@ configure_chroot_browser_profile () {
rm "${chroot}/${TBB_PROFILE}/bookmarks.html"
# Set an appropriate theme
- cat "/usr/share/tails/${browser_name}/theme.js" >> "${browser_prefs}"
+ cat "${chroot_browser_config}/${browser_name}/theme.js" >> "${browser_prefs}"
# Customize the GUI.
local browser_chrome="${browser_profile}/chrome/userChrome.css"
mkdir -p "$(dirname "${browser_chrome}")"
- cat "/usr/share/tails/${browser_name}/userChrome.css" >> "${browser_chrome}"
+ cat "${chroot_browser_config}/common/userChrome.css" \
+ "${chroot_browser_config}/${browser_name}/userChrome.css" >> \
+ "${browser_chrome}"
set_chroot_browser_permissions "${chroot}" "${browser_name}" "${browser_user}"
}
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
index 709dc5c..a00411b 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
@@ -3,18 +3,33 @@
TBB_INSTALL=/usr/local/lib/tor-browser
TBB_PROFILE=/etc/tor-browser/profile
TBB_EXT=/usr/local/share/tor-browser-extensions
-TOR_LAUNCHER_LOCALES_DIR=/usr/share/tor-launcher-standalone/chrome/locale
+TOR_LAUNCHER_INSTALL=/usr/local/lib/tor-launcher-standalone
+TOR_LAUNCHER_LOCALES_DIR="${TOR_LAUNCHER_INSTALL}/chrome/locale"
+
+exec_firefox_helper() {
+ local binary="${1}"; shift
+
+ export LD_LIBRARY_PATH="${TBB_INSTALL}"
+ export FONTCONFIG_PATH="${TBB_INSTALL}/TorBrowser/Data/fontconfig"
+ export FONTCONFIG_FILE="fonts.conf"
+
+ # The Tor Browser often assumes that the current directory is
+ # where the browser lives, e.g. for the fixed set of fonts set by
+ # fontconfig above.
+ cd "${TBB_INSTALL}"
+
+ # From start-tor-browser:
+ unset SESSION_MANAGER
+
+ exec "${TBB_INSTALL}"/"${binary}" "${@}"
+}
exec_firefox() {
- LD_LIBRARY_PATH="${TBB_INSTALL}"
- export LD_LIBRARY_PATH
- exec "${TBB_INSTALL}"/firefox "${@}"
+ exec_firefox_helper firefox "${@}"
}
exec_unconfined_firefox() {
- LD_LIBRARY_PATH="${TBB_INSTALL}"
- export LD_LIBRARY_PATH
- exec "${TBB_INSTALL}"/firefox-unconfined "${@}"
+ exec_firefox_helper firefox-unconfined "${@}"
}
guess_best_tor_browser_locale() {
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher b/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
index f8ffb7d..91c0104 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
+++ b/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
@@ -5,28 +5,20 @@ set -e
# Import export_gnome_env().
. /usr/local/lib/tails-shell-library/gnome.sh
-unset TOR_CONTROL_PASSWD
-unset TOR_FORCE_NET_CONFIG
-TOR_CONFIGURE_ONLY=1
-TOR_CONTROL_PORT=9051
-TOR_CONTROL_COOKIE_AUTH_FILE=/var/run/tor/control.authcookie
-TOR_HIDE_BROWSER_LOGO=1
-export TOR_CONFIGURE_ONLY
-export TOR_CONTROL_PORT
-export TOR_CONTROL_COOKIE_AUTH_FILE
-export TOR_HIDE_BROWSER_LOGO
-
-if echo "$@" | grep -qw -- --force-net-config; then
- TOR_FORCE_NET_CONFIG=1
- export TOR_FORCE_NET_CONFIG
-fi
-
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
# Get LANG
. /etc/default/locale
+# The Tor Browser hardcodes the default profile dir to inside
+# ../TorBrowser/Data/Browser/ from the folder storing the
+# application.ini file supplied via -app. We can use -profile to load
+# it from a different place, but then the Caches directory
+# must still exist and be accessible in the above folder.
+mkdir -p /usr/local/lib/TorBrowser/Data/Browser/Caches
+chmod -R a+rX /usr/local/lib/TorBrowser
+
until pgrep -u "${LIVE_USERNAME}" '^ibus-daemon' >/dev/null ; do
sleep 5
done
@@ -34,11 +26,8 @@ done
export LANG
export_gnome_env
sudo -u ${LIVE_USERNAME} xhost +SI:localuser:tor-launcher
-gksudo -u tor-launcher /usr/bin/tor-launcher
+gksudo -u tor-launcher /usr/local/bin/tor-launcher -- "$@"
RET=${?}
sudo -u ${LIVE_USERNAME} xhost -SI:localuser:tor-launcher
-# Save ~10 RAM (due to the tmpfs) by removing this unused file
-rm -f /usr/Data/Browser/*.default/places.sqlite
-
exit ${RET}
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js
index 364812d..606e9d5 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js
@@ -1,38 +1,20 @@
-// Disable proxying in the chroot
-pref("network.proxy.type", 0);
-pref("network.proxy.socks_remote_dns", false);
-
// Disable update checking
pref("app.update.enabled", false);
pref("extensions.update.enabled", false);
-/* Prevent File -> Print or CTRL+P from causing the browser to hang
- for several minutes while trying to communicate with CUPS, since
- access to port 631 isn't allowed through. */
-pref("print.postscript.cups.enabled", false);
-// Hide "Get Addons" in Add-ons manager
-pref("extensions.getAddons.showPane", false);
-
-/* Google seems like the least suspicious choice of default search
- engine for the Unsafe Browser's in-the-clear traffic. */
-user_pref("browser.search.defaultenginename", "Google");
-user_pref("browser.search.selectedEngine", "Google");
-
// Disable fetching of the new tab page's Tiles links/ads. Ads are
// generally unwanted, and also the fetching is a "phone home" type of
// feature that generates traffic at least the first time the browser
-// is started.
+// is started. It won't work in e.g. the I2P Browser, too.
pref("browser.newtabpage.directory.source", "");
pref("browser.newtabpage.directory.ping", "");
// ... and disable the explanation shown the first time
pref("browser.newtabpage.introShown", true);
-// Don't use geographically specific search prefs, like
-// browser.search.*.US for US locales. Our generated amnesia branding
-// add-on localizes search-engines in an incompatible but equivalent
-// way.
-pref("browser.search.geoSpecificDefaults", false);
+/* Prevent File -> Print or CTRL+P from causing the browser to hang
+ for several minutes while trying to communicate with CUPS, since
+ access to port 631 isn't allowed through. */
+pref("print.postscript.cups.enabled", false);
-// Without setting this, the Download Management page will not update
-// the progress being made.
-pref("browser.download.panel.shown", true);
+// Hide "Get Addons" in Add-ons manager
+pref("extensions.getAddons.showPane", false);
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css
index 2b0c041..02176ab 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css
@@ -1,10 +1,7 @@
-/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-/* Hide Firefox Sync options. Sync hasn't been audited by the
- Tor Browser developers yet (Tor bug #10368), and it doesn't seem to
- work any way (Tor bug #13279). Weak passwords would be a pretty
- serious issue too. */
+/* Hide Firefox Sync options. It will not work with the I2P Browser
+ and will only promote unsupported use cases for the Unsafe Browser. */
#BrowserPreferences radio[pane="paneSync"],
#sync-button,
#sync-menu-button,
@@ -18,20 +15,23 @@
Tools -> Add-ons link to the Add-ons manager. We do not want to
encourage installing such things as it's not part of the supported
use-cases and may have privacy issues. Also they will not persist a
- restart, which is just confusing. */
+ restart, which is just confusing. In the I2P Browser, many of these
+ features will not work any way. */
#menu_openApps,
#menu_openAddons, /* traditional menu */
#add-ons-button, /* new style Firefox menu */
#wrapper-add-ons-button, /* Customize toolbar */
/* Hide the "Share this page" button in the Tool bar, which encourages
- the use of social (= tracking) networks. Note that this one likely
- will be removed upstream in the final Tor Browser 5.0 release. */
+ the use of social (= tracking) networks. These will not work in the
+ I2P browser any way. */
#social-share-button,
-/* Hide TorBrowser Health Report and its configuration option */
+/* Hide the Health Report and its configuration option. It's just a
+ blank page, for some reason. */
#appmenu_healthReport,
#dataChoicesTab,
#healthReport
+/* Do the actual hiding. */
{display: none !important}
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js
index 8b080d2..3db72d1 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js
@@ -7,21 +7,9 @@ pref("network.proxy.http_port", 4444);
pref("network.proxy.no_proxies_on", "127.0.0.1");
pref("network.proxy.ssl", "127.0.0.1");
pref("network.proxy.ssl_port", 4444);
+
// Disable searching from the URL bar
pref("keyword.enabled", false);
-// Hide "Get Addons" in Add-ons manager
-pref("extensions.getAddons.showPane", false);
-/* Prevent File -> Print or CTRL+P from causing the browser to hang
- for several minutes while trying to communicate with CUPS, since
- access to port 631 isn't allowed through. */
-pref("print.postscript.cups.enabled", false);
-
-// Disable fetching of the new tab page's Tiles links/ads. It will not
-// work in the I2P Browser.
-pref("browser.newtabpage.directory.source", "");
-pref("browser.newtabpage.directory.ping", "");
-// ... and disable the explanation shown the first time
-pref("browser.newtabpage.introShown", true);
// Without setting this, the Download Management page will not update
// the progress being made.
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js
index 3d79365..3d79365 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css
index 1fac475..e083af9 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css
@@ -1,4 +1,3 @@
-/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* Hide access to the bookmarks to try to prevent "data loss" due to users
@@ -24,17 +23,6 @@
#wrapper-history-button,
#wrapper-bookmarks-button,
-/* Hide the Tools -> Apps link to the Firefox Marketplace, and
- Tools -> Add-ons link to the Add-ons manager. We do not want to
- encourage installing such things as it's not part of the supported
- use-cases and may have privacy issues. Also they will not persist a
- restart, which is just confusing. In the I2P Browser, many of these
- features will not work any way. */
-#menu_openApps,
-#menu_openAddons, /* traditional menu */
-#add-ons-button, /* new style Firefox menu */
-#wrapper-add-ons-button, /* Customize toolbar */
-
/* Hide the sidebar menu (underneath View) since the default sidebars consist
* of history and bookmarks. Also disable the bookmark toolbar.
*/
@@ -66,27 +54,6 @@ menuitem[command="Browser:SendLink"],
[command="cmd_print"],
*/
-/* Hide the sync functionality which won't work with I2P */
-#BrowserPreferences radio[pane="paneSync"],
-#sync-button,
-#sync-menu-button,
-#sync-setup,
-#sync-setup-appmenu,
-#sync-status-button,
-#sync-syncnowitem-appmenu,
-#wrapper-sync-button,
-
-/* Hide the "Share this page" button in the Tool bar, which encourages
- the use of social (= tracking) networks. These will not work in the
- I2P browser any way. Note that this one likely will be removed
- upstream in the final Tor Browser 5.0 release. */
-#social-share-button,
-
-/* Hide the "Keyboard shortcuts" and "Tour" options from
-from the Help menu */
-#menu_keyboardShortcuts,
-#menu_openTour,
-
/* Without I2P search engines defined, the search bar is useless.
* Since there are no I2P search engines added to Tails (yet),
* let's hide it and the Update Pane in Firefox's Preferences.
@@ -94,9 +61,9 @@ from the Help menu */
#search-container,
#updateTab,
-/* Hide options in the Help menu that lead to disallowed resources on the
- * Internet.
- */
+/* Hide options that lead to resources inaccessible over I2P */
+#menu_keyboardShortcuts,
+#menu_openTour,
#appmenu_feedbackPage,
#appmenu_gettingStarted,
#appmenu_openHelp,
@@ -107,12 +74,7 @@ from the Help menu */
/* Hide the TorButton button from the toolbar */
#torbutton-button,
-#wrapper-torbutton-button,
-
-/* Hide TorBrowser Health Report and its configuration option */
-#appmenu_healthReport,
-#dataChoicesTab,
-#healthReport
+#wrapper-torbutton-button
-/* Now the actual hiding */
+/* Do the actual hiding. */
{display: none !important}
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
new file mode 100644
index 0000000..8062867
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
@@ -0,0 +1,18 @@
+// Disable proxying in the chroot
+pref("network.proxy.type", 0);
+pref("network.proxy.socks_remote_dns", false);
+
+/* Google seems like the least suspicious choice of default search
+ engine for the Unsafe Browser's in-the-clear traffic. */
+user_pref("browser.search.defaultenginename", "Google");
+user_pref("browser.search.selectedEngine", "Google");
+
+// Don't use geographically specific search prefs, like
+// browser.search.*.US for US locales. Our generated amnesia branding
+// add-on localizes search-engines in an incompatible but equivalent
+// way.
+pref("browser.search.geoSpecificDefaults", false);
+
+// Without setting this, the Download Management page will not update
+// the progress being made.
+pref("browser.download.panel.shown", true);
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js
index 717c3b1..717c3b1 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
new file mode 100644
index 0000000..e4d1062
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
@@ -0,0 +1 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
index d5511de..0d0a1ac 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
@@ -1 +1 @@
-http://torbrowser-archive.tails.boum.org/5.5/
+http://torbrowser-archive.tails.boum.org/5.5.2/
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
index 0be7356..322b9e8 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,16 +1,16 @@
-f175e3908ab741172dca082a2a1703fbb05148b51dac751507dc7632c50f693a tor-browser-linux32-5.5_ar.tar.xz
-28787dd811152b9afd1d1821a0770bd9eefe7fc25bb415c3d5ad0765665e8d8d tor-browser-linux32-5.5_de.tar.xz
-8ebf47dc26fd6d867d54cf6d04675e5bd3fdba4927beaf6af340c2a07b8f7a75 tor-browser-linux32-5.5_en-US.tar.xz
-e28c844b7fd02515cf51f245ac4be2fbc2ee77dd0053515db436090751fa7b97 tor-browser-linux32-5.5_es-ES.tar.xz
-eb56faf8639c4f7019b6adcdb0140048a95a7d165893c8d61a37780ac74b1488 tor-browser-linux32-5.5_fa.tar.xz
-ac90e739fd3fb1e096e3f728265227df81e9416b8e34345513194ef0f2e69e3f tor-browser-linux32-5.5_fr.tar.xz
-013d6b63ddb16c97cfaef532b11729b017903c80242ef6427ec24c19466f07fa tor-browser-linux32-5.5_it.tar.xz
-3dd24c7e2cf19aede85297913e36744812361cd47f5a26ddc4fca587cd0ee257 tor-browser-linux32-5.5_ja.tar.xz
-29c22c65688c87b38f291ffc73f78bd82309e2e1acb06c4716a95f38abba480b tor-browser-linux32-5.5_ko.tar.xz
-410fa9fb4d7f2404b5538a3a487b12aca87ceb26bfa2b95565a2b41ad9835beb tor-browser-linux32-5.5_nl.tar.xz
-fe9f8912254807af8e2171683fbc6b60d00357300f967a4f3dc55a796ea7c6af tor-browser-linux32-5.5_pl.tar.xz
-11936a718c8ee00a464ef24ed0454a0db50142512a67d54058e4468f854ee702 tor-browser-linux32-5.5_pt-PT.tar.xz
-954a32dc88c79ac22bb4010156c2a64eb0fa2c2e9d30fe16618f1c8b05fe8a6c tor-browser-linux32-5.5_ru.tar.xz
-a50121d3a1d3d0b60b4fb45be25122298aa55ff052b6303e789425f047e16272 tor-browser-linux32-5.5_tr.tar.xz
-25ffc583e8a8dcf4d274c6555961fdd05bc1c57c1e4b054b9e64cb07104ebe44 tor-browser-linux32-5.5_vi.tar.xz
-053cec43ed8447e2ad3a122c3d6bd80699b3569c06c26b20bbbb626effcdf406 tor-browser-linux32-5.5_zh-CN.tar.xz
+9b67450e4a4ea482b058c266edfebed219f09760dd8d02198c20eb697a1cdf82 tor-browser-linux32-5.5.2_ar.tar.xz
+3b32acd9ecb80f0c9c83c7111981e97481b236f6cf698b5a124b54f68fb9ca84 tor-browser-linux32-5.5.2_de.tar.xz
+19e36f9fd66135308202f78ea5f7f5835f2c56960efe47a44de6d8d1f3354cbe tor-browser-linux32-5.5.2_en-US.tar.xz
+1e2c4500697cd512d0e1aacdcacdf4edcd923d37d41d81f93c5f2653d0889b94 tor-browser-linux32-5.5.2_es-ES.tar.xz
+fdd12dfc1d729ed995e35ce282343421eab8085d7b986d9cb1767a26cd21e801 tor-browser-linux32-5.5.2_fa.tar.xz
+dcdec685a1f5a4b4d238787bbcb6e88d3701f83f7f9c0e9e089106a58c75da8b tor-browser-linux32-5.5.2_fr.tar.xz
+e7ad29a4fb4cf2e3553e1e1e60be3856807bce609207264c07c95aedfb97851e tor-browser-linux32-5.5.2_it.tar.xz
+adb02492193eec5a9ec3cff3724eb5e8f5a6115eb4cbb1d1127211685d8d2a62 tor-browser-linux32-5.5.2_ja.tar.xz
+7d79db5daa524deea227d4627457200dbbd7ccb14d3ea9ecf9355569eb22dcba tor-browser-linux32-5.5.2_ko.tar.xz
+3c89edcc1d532bed6ee7fb955cb58165efcaea2be9309183d403f76de475ebc4 tor-browser-linux32-5.5.2_nl.tar.xz
+15cef82dd7f4ed471391221e0313078fbce416b26426a9ced8e350e04f16e875 tor-browser-linux32-5.5.2_pl.tar.xz
+3fd03133d2c12bc23f23bf3b99b067f21ec0b3284874fecd9ff67fc0b985fdc2 tor-browser-linux32-5.5.2_pt-PT.tar.xz
+53f680c5228e2beecd08668322d0d91a39b2f1433ae5d23fa544739355c9d05c tor-browser-linux32-5.5.2_ru.tar.xz
+8be80d4ae769e1ea39c8e860e2588af5c76a75dd7bbe5c4df9d7c90baba659aa tor-browser-linux32-5.5.2_tr.tar.xz
+cb83311d8c94d1d2fa5bac7b5961a94c741de2945e76b7564b97cc407451a6d5 tor-browser-linux32-5.5.2_vi.tar.xz
+11ea21a9abc7b3425eca186d58cf49dcadb03439fa2dddc8699bf8151ec611a9 tor-browser-linux32-5.5.2_zh-CN.tar.xz
diff --git a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
index 3abfd8a..fa3bd94 100644
--- a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
+++ b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
@@ -1,5 +1,5 @@
---- /tmp/torbrowser-launcher-0.2.1/apparmor/torbrowser.Browser.firefox 2015-11-19 13:21:34.000000000 +0100
-+++ apparmor/torbrowser.Browser.firefox 2015-11-19 13:19:30.680460539 +0100
+--- /tmp/torbrowser-launcher-0.2.2/apparmor/torbrowser.Browser.firefox 2016-02-08 13:11:05.000000000 +0100
++++ apparmor/torbrowser.Browser.firefox 2016-02-08 13:25:15.170069917 +0100
@@ -1,13 +1,15 @@
# Last modified
#include <tunables/global>
@@ -18,7 +18,7 @@
# Uncomment the following lines if you want to give the Tor Browser read-write
# access to most of your personal files.
-@@ -17,41 +19,52 @@
+@@ -17,45 +19,52 @@
#dbus,
network tcp,
@@ -50,13 +50,17 @@
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/ r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/* r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/.** rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/update.test/ rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/.** rwk,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/ r,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/** r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/ rw,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/** rw,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/updated/ rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/components/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/browser/components/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox rix,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/updates/[0-9]*/updater ix,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/updates/0/MozUpdater/bgupdate/updater ix,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profiles.ini r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profile.default/ r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profile.default/** rwk,
@@ -96,7 +100,7 @@
/etc/mailcap r,
/etc/mime.types r,
-@@ -74,6 +87,30 @@
+@@ -78,6 +87,30 @@
/sys/devices/pci[0-9]*/**/uevent r,
owner /{dev,run}/shm/shmfd-* rw,
@@ -127,7 +131,7 @@
# KDE 4
owner @{HOME}/.kde/share/config/* r,
-@@ -81,5 +118,10 @@
+@@ -85,5 +118,10 @@
/etc/xfce4/defaults.list r,
/usr/share/xfce4/applications/ r,
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 42bc131..0dd747d 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -399,3 +399,6 @@ openjdk-7-jre
# Enable Electrum's Qt GUI
python-qt4
+
+# Provide gnome-open (used to open e.g. URLs in KeePassX, Icedove, Electrum...)
+libgnome2-bin
diff --git a/debian/changelog b/debian/changelog
index 71f38d1..2f14f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,59 @@
-tails (2.2) UNRELEASED; urgency=medium
+tails (2.0.2) UNRELEASED; urgency=medium
* Dummy entry.
- -- anonym <anonym@riseup.net> Tue, 26 Jan 2016 02:32:45 +0100
+ -- anonym <anonym@riseup.net> Sat, 13 Feb 2016 15:30:26 +0000
+
+tails (2.0.1) unstable; urgency=medium
+
+ * Major new features and changes
+ - Enable the Tor Browser's font fingerprinting protection
+ (Closes: #11000). We do it for all browsers (including
+ the Unsafe Browser and I2P Browser mainly to avoid making our
+ automated test suite overly complex. This implied to set an appropriate
+ working directory when launching the Tor Browser, to accommodate for
+ the assumptions it makes about this.
+
+ * Security fixes
+ - Upgrade Tor Browser to 5.5.2 (Closes: #11105).
+
+ * Bugfixes
+ - Repair 32-bit UEFI support (Closes: #11007); bugfix on 2.0.
+ - Add libgnome2-bin to installed packages list to provide gnome-open,
+ which fixes URL handling at least in KeePassX, Electrum and Icedove
+ (Closes: #11031); bugfix on 2.0. Thanks to segfault for the patch!
+
+ * Minor improvements
+ - Refactor and de-duplicate the chrooted browsers' configuration:
+ prefs.js, userChrome.css (Closes: #9896).
+ - Make the -profile Tor Launcher workaround simpler (Closes: #7943).
+ - Move Torbutton environment configuration to the tor-browser script,
+ instead of polluting the default system environment with it.
+ - Refresh patch against the Tor Browser AppArmor profile
+ (Closes: #11078).
+ - Propagate Tor Launcher options via the wrapper.
+ - Move tor-launcher script to /usr/local/bin.
+ - Move tor-launcher-standalone to /usr/local/lib.
+ - Move Tor Launcher env configuration closer to the place where it is used,
+ for simplicity's sake.
+
+ * Test suite
+ - Mass update browser and Tor Launcher related images due to font change,
+ caused by Tor Browser 5.5's font fingerprinting protection
+ (Closes: #11097). And then, use separate PrintToFile.png for the browsers,
+ and Evince, since it cannot be shared anymore.
+ - Adjust to the refactored chrooted browsers configuration handling.
+ - Test that Tor Launcher uses the correct Tor Browser libraries.
+ - Allow more slack when verifying that the date that was set.
+ - Bump a bit the timeout used when waiting for the remote shell.
+ - Bump timeout for the process to disappear, when closing Evince.
+ - Bump timeout when saving persistence configuration.
+ - Bump timeout for bootstrapping I2P.
+
+ * Build system
+ - Remove no longer relevant places.sqlite cleanup procedure.
+
+ -- Tails developers <tails@boum.org> Fri, 12 Feb 2016 13:00:15 +0000
tails (2.0) unstable; urgency=medium
@@ -19,12 +70,7 @@ tails (2.0) unstable; urgency=medium
* Security fixes
- Minimally sandbox many services with systemd's namespacing features.
- Upgrade Linux to 3.16.7-ckt20-1+deb8u3.
- - Upgrade Icedove to 38.5.0-1~deb8u1.
- Upgrade Git to 1:2.1.4-2.1+deb8u1.
- - Upgrade libxml2 to 2.9.1+dfsg1-5+deb8u1.
- - Upgrade Samba-related packages to 2:4.1.17+dfsg-2+deb8u1.
- - Upgrade libldb1 to 2:1.1.17-2+deb8u1.
- - Upgrade KeePassX to 0.4.3+dfsg-0.1+deb8u1.
- Upgrade Perl to 5.20.2-3+deb8u3.
- Upgrade bind9-related packages to 1:9.9.5.dfsg-9+deb8u5.
- Upgrade FUSE to 2.9.3-15+deb8u2.
@@ -374,7 +420,7 @@ tails (2.0) unstable; urgency=medium
currently running a reboot job. This is not the case when the emergency
shutdown has been triggered, so we removed this check
· migrate tails-kexec to the /lib/systemd/system-shutdown/ facility
- - don't (try to) switch to tty1 on emergency shutdown: it apparently
+ · don't (try to) switch to tty1 on emergency shutdown: it apparently
requires data that we haven't locked into memory, and then it blocks
the whole emergency shutdown process
- Display a slightly darker version of the desktop wallpaper on the screen
diff --git a/features/evince.feature b/features/evince.feature
index 23e6220..6fd27ec 100644
--- a/features/evince.feature
+++ b/features/evince.feature
@@ -4,7 +4,7 @@ Feature: Using Evince
I want to view and print PDF files in Evince
And AppArmor should prevent Evince from doing dangerous things
- #10775, #10994
+ #10994
@fragile
Scenario: I can view and print a PDF file stored in /usr/share
Given I have started Tails from DVD without network and logged in
diff --git a/features/images/BrowserAddressBar.png b/features/images/BrowserAddressBar.png
index 8da3af9..1b7571f 100644
--- a/features/images/BrowserAddressBar.png
+++ b/features/images/BrowserAddressBar.png
Binary files differ
diff --git a/features/images/BrowserDownloadDialog.png b/features/images/BrowserDownloadDialog.png
index 8783b6d..469efe5 100644
--- a/features/images/BrowserDownloadDialog.png
+++ b/features/images/BrowserDownloadDialog.png
Binary files differ
diff --git a/features/images/BrowserDownloadDialogSaveAsButton.png b/features/images/BrowserDownloadDialogSaveAsButton.png
index 60933ae..bd3e1c0 100644
--- a/features/images/BrowserDownloadDialogSaveAsButton.png
+++ b/features/images/BrowserDownloadDialogSaveAsButton.png
Binary files differ
diff --git a/features/images/BrowserPrintToFile.png b/features/images/BrowserPrintToFile.png
new file mode 100644
index 0000000..568c315
--- /dev/null
+++ b/features/images/BrowserPrintToFile.png
Binary files differ
diff --git a/features/images/PrintToFile.png b/features/images/EvincePrintToFile.png
index d0b5297..d0b5297 100644
--- a/features/images/PrintToFile.png
+++ b/features/images/EvincePrintToFile.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmark.png b/features/images/GtkTorBrowserPersistentBookmark.png
index a487495..3e3e6b7 100644
--- a/features/images/GtkTorBrowserPersistentBookmark.png
+++ b/features/images/GtkTorBrowserPersistentBookmark.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmarkSelected.png b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
index 6ad7516..ee6384c 100644
--- a/features/images/GtkTorBrowserPersistentBookmarkSelected.png
+++ b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
Binary files differ
diff --git a/features/images/I2PNetworkHidden.png b/features/images/I2PNetworkHidden.png
index 99ebd45..07c8da6 100644
--- a/features/images/I2PNetworkHidden.png
+++ b/features/images/I2PNetworkHidden.png
Binary files differ
diff --git a/features/images/I2PRouterConsole.png b/features/images/I2PRouterConsole.png
index dfb67e9..6f7a8ed 100644
--- a/features/images/I2PRouterConsole.png
+++ b/features/images/I2PRouterConsole.png
Binary files differ
diff --git a/features/images/I2PSharedClientTunnels.png b/features/images/I2PSharedClientTunnels.png
index a5e34ab..22b1754 100644
--- a/features/images/I2PSharedClientTunnels.png
+++ b/features/images/I2PSharedClientTunnels.png
Binary files differ
diff --git a/features/images/SupportDocumentation.png b/features/images/SupportDocumentation.png
index ae648cd..bccfb80 100644
--- a/features/images/SupportDocumentation.png
+++ b/features/images/SupportDocumentation.png
Binary files differ
diff --git a/features/images/SupportDocumentationGerman.png b/features/images/SupportDocumentationGerman.png
index 36ab037..24c7708 100644
--- a/features/images/SupportDocumentationGerman.png
+++ b/features/images/SupportDocumentationGerman.png
Binary files differ
diff --git a/features/images/TorBrowserBookmarkPrompt.png b/features/images/TorBrowserBookmarkPrompt.png
index 24cde85..9cce24f 100644
--- a/features/images/TorBrowserBookmarkPrompt.png
+++ b/features/images/TorBrowserBookmarkPrompt.png
Binary files differ
diff --git a/features/images/TorBrowserEFFBookmark.png b/features/images/TorBrowserEFFBookmark.png
index ff4a68a..e6bf815 100644
--- a/features/images/TorBrowserEFFBookmark.png
+++ b/features/images/TorBrowserEFFBookmark.png
Binary files differ
diff --git a/features/images/TorBrowserNoPlugins.png b/features/images/TorBrowserNoPlugins.png
index 287b234..597101e 100644
--- a/features/images/TorBrowserNoPlugins.png
+++ b/features/images/TorBrowserNoPlugins.png
Binary files differ
diff --git a/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
index 8de70ff..b9e8448 100644
--- a/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
+++ b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
Binary files differ
diff --git a/features/images/TorBrowserOkButton.png b/features/images/TorBrowserOkButton.png
index a9ee1d0..1d536f6 100644
--- a/features/images/TorBrowserOkButton.png
+++ b/features/images/TorBrowserOkButton.png
Binary files differ
diff --git a/features/images/TorBrowserPrintDialog.png b/features/images/TorBrowserPrintDialog.png
index f13edce..8e9aa93 100644
--- a/features/images/TorBrowserPrintDialog.png
+++ b/features/images/TorBrowserPrintDialog.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFile.png b/features/images/TorBrowserPrintOutputFile.png
index 4b8a142..d6aa5cf 100644
--- a/features/images/TorBrowserPrintOutputFile.png
+++ b/features/images/TorBrowserPrintOutputFile.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFileSelected.png b/features/images/TorBrowserPrintOutputFileSelected.png
index 158ada3..41e9599 100644
--- a/features/images/TorBrowserPrintOutputFileSelected.png
+++ b/features/images/TorBrowserPrintOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSaveOutputFileSelected.png b/features/images/TorBrowserSaveOutputFileSelected.png
index ca26b77..8de38a9 100644
--- a/features/images/TorBrowserSaveOutputFileSelected.png
+++ b/features/images/TorBrowserSaveOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSavedStartupPage.png b/features/images/TorBrowserSavedStartupPage.png
index 5d7d519..f32a0f9 100644
--- a/features/images/TorBrowserSavedStartupPage.png
+++ b/features/images/TorBrowserSavedStartupPage.png
Binary files differ
diff --git a/features/images/TorBrowserUnableToConnect.png b/features/images/TorBrowserUnableToConnect.png
index 943357d..bd6d251 100644
--- a/features/images/TorBrowserUnableToConnect.png
+++ b/features/images/TorBrowserUnableToConnect.png
Binary files differ
diff --git a/features/images/TorButtonNewIdentity.png b/features/images/TorButtonNewIdentity.png
index 143d400..ee533ee 100644
--- a/features/images/TorButtonNewIdentity.png
+++ b/features/images/TorButtonNewIdentity.png
Binary files differ
diff --git a/features/images/TorLauncherBridgeList.png b/features/images/TorLauncherBridgeList.png
index bad0810..c4981ea 100644
--- a/features/images/TorLauncherBridgeList.png
+++ b/features/images/TorLauncherBridgeList.png
Binary files differ
diff --git a/features/images/TorLauncherBridgePrompt.png b/features/images/TorLauncherBridgePrompt.png
index c224ed8..9fc5ebb 100644
--- a/features/images/TorLauncherBridgePrompt.png
+++ b/features/images/TorLauncherBridgePrompt.png
Binary files differ
diff --git a/features/images/TorLauncherConfigureButton.png b/features/images/TorLauncherConfigureButton.png
index b96a742..1acdcff 100644
--- a/features/images/TorLauncherConfigureButton.png
+++ b/features/images/TorLauncherConfigureButton.png
Binary files differ
diff --git a/features/images/TorLauncherConnectingWindow.png b/features/images/TorLauncherConnectingWindow.png
index 98d34aa..3a6af8f 100644
--- a/features/images/TorLauncherConnectingWindow.png
+++ b/features/images/TorLauncherConnectingWindow.png
Binary files differ
diff --git a/features/images/TorLauncherFinishButton.png b/features/images/TorLauncherFinishButton.png
index 6d763b5..cee5b53 100644
--- a/features/images/TorLauncherFinishButton.png
+++ b/features/images/TorLauncherFinishButton.png
Binary files differ
diff --git a/features/images/TorLauncherNextButton.png b/features/images/TorLauncherNextButton.png
index d8bc684..a6c4aac 100644
--- a/features/images/TorLauncherNextButton.png
+++ b/features/images/TorLauncherNextButton.png
Binary files differ
diff --git a/features/images/TorLauncherYesRadioOption.png b/features/images/TorLauncherYesRadioOption.png
index 1c2a772..6d3df76 100644
--- a/features/images/TorLauncherYesRadioOption.png
+++ b/features/images/TorLauncherYesRadioOption.png
Binary files differ
diff --git a/features/images/UnsafeBrowserExportBookmarksButton.png b/features/images/UnsafeBrowserExportBookmarksButton.png
index b568dc3..964e339 100644
--- a/features/images/UnsafeBrowserExportBookmarksButton.png
+++ b/features/images/UnsafeBrowserExportBookmarksButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserExportBookmarksMenuEntry.png b/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
index fdea806..a996e1f 100644
--- a/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
+++ b/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTab.png b/features/images/UnsafeBrowserNetworkTab.png
index 743982c..2c6c0ef 100644
--- a/features/images/UnsafeBrowserNetworkTab.png
+++ b/features/images/UnsafeBrowserNetworkTab.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png b/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
index 92139b7..6ad4531 100644
--- a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
+++ b/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTabSettingsButton.png b/features/images/UnsafeBrowserNetworkTabSettingsButton.png
index 414cf7a..ba25ea8 100644
--- a/features/images/UnsafeBrowserNetworkTabSettingsButton.png
+++ b/features/images/UnsafeBrowserNetworkTabSettingsButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNoAddons.png b/features/images/UnsafeBrowserNoAddons.png
index 24e1baa..75c426d 100644
--- a/features/images/UnsafeBrowserNoAddons.png
+++ b/features/images/UnsafeBrowserNoAddons.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNoProxySelected.png b/features/images/UnsafeBrowserNoProxySelected.png
index d28dae1..19a6415 100644
--- a/features/images/UnsafeBrowserNoProxySelected.png
+++ b/features/images/UnsafeBrowserNoProxySelected.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxyRefused.png b/features/images/UnsafeBrowserProxyRefused.png
index c0d84d4..f8233a0 100644
--- a/features/images/UnsafeBrowserProxyRefused.png
+++ b/features/images/UnsafeBrowserProxyRefused.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxySettingsOkButton.png b/features/images/UnsafeBrowserProxySettingsOkButton.png
index 84b23b4..251ceb8 100644
--- a/features/images/UnsafeBrowserProxySettingsOkButton.png
+++ b/features/images/UnsafeBrowserProxySettingsOkButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxySettingsWindow.png b/features/images/UnsafeBrowserProxySettingsWindow.png
index cda8689..9013ccf 100644
--- a/features/images/UnsafeBrowserProxySettingsWindow.png
+++ b/features/images/UnsafeBrowserProxySettingsWindow.png
Binary files differ
diff --git a/features/images/UnsafeBrowserStartPage.png b/features/images/UnsafeBrowserStartPage.png
index 67a9923..5ec183f 100644
--- a/features/images/UnsafeBrowserStartPage.png
+++ b/features/images/UnsafeBrowserStartPage.png
Binary files differ
diff --git a/features/step_definitions/apt.rb b/features/step_definitions/apt.rb
index e8805f5..c69d259 100644
--- a/features/step_definitions/apt.rb
+++ b/features/step_definitions/apt.rb
@@ -45,7 +45,7 @@ Then /^I should be able to install a package using Synaptic$/ do
@screen.wait_and_click('SynapticApplyButton.png', 10)
@screen.wait('SynapticApplyPrompt.png', 60)
@screen.type(Sikuli::Key.ENTER)
- @screen.wait('SynapticChangesAppliedPrompt.png', 120)
+ @screen.wait('SynapticChangesAppliedPrompt.png', 240)
step "package \"#{package}\" is installed"
end
diff --git a/features/step_definitions/browser.rb b/features/step_definitions/browser.rb
index 6b5aabf..84ef1d3 100644
--- a/features/step_definitions/browser.rb
+++ b/features/step_definitions/browser.rb
@@ -35,6 +35,7 @@ def xul_application_info(application)
'echo ${TBB_INSTALL}/firefox', :libs => 'tor-browser'
).stdout.chomp
address_bar_image = "BrowserAddressBar.png"
+ unused_tbb_libs = ['libnssdbm3.so']
case application
when "Tor Browser"
user = LIVE_USER
@@ -53,10 +54,18 @@ def xul_application_info(application)
new_tab_button_image = "I2PBrowserNewTabButton.png"
when "Tor Launcher"
user = "tor-launcher"
- cmd_regex = "#{binary} -app /home/#{user}/\.tor-launcher/tor-launcher-standalone/application\.ini"
+ # We do not enable AppArmor confinement for the Tor Launcher.
+ binary = "#{binary}-unconfined"
+ tor_launcher_install = $vm.execute_successfully(
+ 'echo ${TOR_LAUNCHER_INSTALL}', :libs => 'tor-browser'
+ ).stdout.chomp
+ cmd_regex = "#{binary}\s+-app #{tor_launcher_install}/application\.ini.*"
chroot = ""
new_tab_button_image = nil
address_bar_image = nil
+ # The standalone Tor Launcher uses fewer libs than the full
+ # browser.
+ unused_tbb_libs.concat(["libfreebl3.so", "libnssckbi.so", "libsoftokn3.so"])
else
raise "Invalid browser or XUL application: #{application}"
end
@@ -66,6 +75,7 @@ def xul_application_info(application)
:chroot => chroot,
:new_tab_button_image => new_tab_button_image,
:address_bar_image => address_bar_image,
+ :unused_tbb_libs => unused_tbb_libs,
}
end
@@ -108,8 +118,7 @@ Then /^the (.*) has no plugins installed$/ do |browser|
step "I see \"TorBrowserNoPlugins.png\" after at most 30 seconds"
end
-def xul_app_shared_lib_check(pid, chroot)
- expected_absent_tbb_libs = ['libnssdbm3.so']
+def xul_app_shared_lib_check(pid, chroot, expected_absent_tbb_libs = [])
absent_tbb_libs = []
unwanted_native_libs = []
tbb_libs = $vm.execute_successfully("ls -1 #{chroot}${TBB_INSTALL}/*.so",
@@ -141,7 +150,7 @@ Then /^the (.*) uses all expected TBB shared libraries$/ do |application|
info = xul_application_info(application)
pid = $vm.execute_successfully("pgrep --uid #{info[:user]} --full --exact '#{info[:cmd_regex]}'").stdout.chomp
assert(/\A\d+\z/.match(pid), "It seems like #{application} is not running")
- xul_app_shared_lib_check(pid, info[:chroot])
+ xul_app_shared_lib_check(pid, info[:chroot], info[:unused_tbb_libs])
end
Then /^the (.*) chroot is torn down$/ do |browser|
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 5b7a144..2067561 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -809,8 +809,8 @@ When /^I can print the current page as "([^"]+[.]pdf)" to the (default downloads
output_dir = "/home/#{LIVE_USER}/Tor Browser"
end
@screen.type("p", Sikuli::KeyModifier.CTRL)
- @screen.wait("TorBrowserPrintDialog.png", 10)
- @screen.wait_and_click("PrintToFile.png", 10)
+ @screen.wait("TorBrowserPrintDialog.png", 20)
+ @screen.wait_and_click("BrowserPrintToFile.png", 10)
@screen.wait_and_double_click("TorBrowserPrintOutputFile.png", 10)
@screen.hide_cursor
@screen.wait("TorBrowserPrintOutputFileSelected.png", 10)
diff --git a/features/step_definitions/evince.rb b/features/step_definitions/evince.rb
index 990c6ce..9411ac4 100644
--- a/features/step_definitions/evince.rb
+++ b/features/step_definitions/evince.rb
@@ -5,12 +5,14 @@ end
Then /^I can print the current document to "([^"]+)"$/ do |output_file|
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("EvincePrintDialog.png", 10)
- @screen.wait_and_click("PrintToFile.png", 10)
+ @screen.wait_and_click("EvincePrintToFile.png", 10)
@screen.wait_and_click("EvincePrintOutputFileButton.png", 10)
@screen.wait("EvincePrintFileDialog.png", 10)
# Only the file's basename is selected by double-clicking,
# so we type only the desired file's basename to replace it
- @screen.type(output_file.sub(/[.]pdf$/, '') + Sikuli::Key.ENTER)
+ $vm.set_clipboard(output_file.sub(/[.]pdf$/, ''))
+ @screen.type('v', Sikuli::KeyModifier.CTRL)
+ @screen.type(Sikuli::Key.ENTER)
@screen.wait_and_click("EvincePrintButton.png", 10)
try_for(10, :msg => "The document was not printed to #{output_file}") {
$vm.file_exist?(output_file)
diff --git a/features/step_definitions/i2p.rb b/features/step_definitions/i2p.rb
index ee35480..21ddac2 100644
--- a/features/step_definitions/i2p.rb
+++ b/features/step_definitions/i2p.rb
@@ -82,7 +82,7 @@ Then /^I see a notification that I2P failed to start$/ do
end
Then /^I see shared client tunnels in the I2P router console$/ do
- @screen.wait('I2PSharedClientTunnels.png', 7 * 60)
+ @screen.wait('I2PSharedClientTunnels.png', 15 * 60)
end
Then /^I see a notification that I2P is not ready$/ do
diff --git a/features/step_definitions/unsafe_browser.rb b/features/step_definitions/unsafe_browser.rb
index 12f1b81..b8c0498 100644
--- a/features/step_definitions/unsafe_browser.rb
+++ b/features/step_definitions/unsafe_browser.rb
@@ -166,14 +166,14 @@ Then /^the Unsafe Browser complains that no DNS server is configured$/ do
end
Then /^I configure the Unsafe Browser to check for updates more frequently$/ do
- prefs = '/usr/share/tails/unsafe-browser/prefs.js'
+ prefs = '/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js'
$vm.file_append(prefs, 'pref("app.update.idletime", 1);')
$vm.file_append(prefs, 'pref("app.update.promptWaitTime", 1);')
$vm.file_append(prefs, 'pref("app.update.interval", 5);')
end
But /^checking for updates is disabled in the Unsafe Browser's configuration$/ do
- prefs = '/usr/share/tails/unsafe-browser/prefs.js'
+ prefs = '/usr/share/tails/chroot-browsers/common/prefs.js'
assert($vm.file_content(prefs).include?('pref("app.update.enabled", false)'))
end
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index d491f6a..76f94d2 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -174,7 +174,7 @@ Given /^I enable all persistence presets$/ do
@screen.type(Sikuli::Key.TAB + Sikuli::Key.SPACE)
end
@screen.wait_and_click('PersistenceWizardSave.png', 10)
- @screen.wait('PersistenceWizardDone.png', 20)
+ @screen.wait('PersistenceWizardDone.png', 30)
@screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
end
diff --git a/features/tor_bridges.feature b/features/tor_bridges.feature
index cab4e39..b5277ca 100644
--- a/features/tor_bridges.feature
+++ b/features/tor_bridges.feature
@@ -9,6 +9,7 @@ Feature: Using Tails with Tor pluggable transports
And I capture all network traffic
When the network is plugged
Then the Tor Launcher autostarts
+ And the Tor Launcher uses all expected TBB shared libraries
Scenario: Using bridges
When I configure some Bridge pluggable transports in Tor Launcher
diff --git a/po/ar.po b/po/ar.po
index 659965c..7e4c706 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2014-12-05 17:21+0000\n"
"Last-Translator: Osama M. Mneina <o.mneina@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
@@ -459,19 +459,19 @@ msgstr ""
msgid "Learn more"
msgstr "إطلع أكثر حول Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "تور غير جاهز"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "تور غير جاهز. بدء متصفح تور على أي حال؟"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "أبدأ متصفح تور"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "إلغاء"
diff --git a/po/az.po b/po/az.po
index 84a3376..3485fab 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2014-12-30 17:30+0000\n"
"Last-Translator: E <ehuseynzade@gmail.com>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
@@ -442,19 +442,19 @@ msgstr ""
msgid "Learn more"
msgstr "Tails haqqında daha ətraflı öyrən"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor hazır deyil"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor hazır deyil. Buna baxmayaraq Tor Brauzeri açılsın?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Tor Brauzerini Başlat"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Ləğv et"
diff --git a/po/bg.po b/po/bg.po
index 5a09d9d..ac2d65e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 15:37+0000\n"
"Last-Translator: Tsvetan Nikolov <slakware@gmail.com>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/"
@@ -458,19 +458,19 @@ msgstr ""
msgid "Learn more"
msgstr "Научете повече"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor не е готов"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor не е готов.Да стартирам ли Tor Браузър въпреки всичко?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Стартирай Tor Браузър"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Отказ"
diff --git a/po/ca.po b/po/ca.po
index 11e97fe..df1b34a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-09-12 16:06+0000\n"
"Last-Translator: laia_\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
@@ -454,19 +454,19 @@ msgstr ""
msgid "Learn more"
msgstr "Aprén més sobre Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor no es troba actiu"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor no es troba actiu. Iniciar el navegador Tor indiferentment?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Inicia el navegador Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Cancel·la"
diff --git a/po/cs.po b/po/cs.po
index 0d8aefd..077cf72 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-08-28 07:47+0000\n"
"Last-Translator: Vlastimil Burián <burian.vlastimil2@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
@@ -454,19 +454,19 @@ msgstr ""
msgid "Learn more"
msgstr "Zjistěte více o Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor není připraven"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor není připraven. Přesto spustit Tor Browser?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Nastartovat Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Zrušit"
diff --git a/po/cy.po b/po/cy.po
index 18f5b99..c4dfc1e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2014-04-30 09:10+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
@@ -449,19 +449,19 @@ msgstr ""
msgid "Learn more"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Nid yw Tor yn barod"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Nid yw Tor yn barod. Dechrau Tor beth bynnag?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Cychwyn Porwr Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Canslo"
diff --git a/po/da.po b/po/da.po
index 9cd11ff..73a9e9a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-12-08 12:29+0000\n"
"Last-Translator: Tommy Gade\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
@@ -458,19 +458,19 @@ msgstr ""
msgid "Learn more"
msgstr "Lær mere om Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor er ikke klar"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor er ikke klar. Start Tor Browser alligevel?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Start Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Annullér"
diff --git a/po/de.po b/po/de.po
index 8f07c3a..69eb145 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,6 +4,7 @@
#
# Translators:
# Andreas Demmelbauer, 2014
+# Christian Spaan <gyges@gmx.net>, 2016
# Claudia <claudianied@web.de>, 2015
# trantor <clucko3@gmail.com>, 2014
# DoKnGH26" 21 <dokngh2621@gmail.com>, 2015
@@ -11,24 +12,25 @@
# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
# gerhard <listmember@rinnberger.de>, 2013
# konstibae, 2015
-# Larson März <lmaerz@emailn.de>, 2013
+# Larson März <larson@protonmail.ch>, 2013
# Mario Baier <mario.baier26@gmx.de>, 2013
# Mart3000, 2015
# malexmave <inactive+malexmave@transifex.com>, 2014
+# max weber, 2015
# Sandra R <drahtseilakt@live.com>, 2014
# Sebastian <sebix+transifex@sebix.at>, 2015
# spriver <tor@dominik-pilatzki.de>, 2015
# sycamoreone <sycamoreone@riseup.net>, 2014
-# Tobias Bannert <tobannert@gmail.com>, 2014
-# try once <lh-account-a@use.startmail.com>, 2015
+# Tobias Bannert <tobannert@gmail.com>, 2014,2016
+# try once, 2015
# rike, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2015-10-28 16:18+0000\n"
-"Last-Translator: spriver <tor@dominik-pilatzki.de>\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-01-28 00:46+0000\n"
+"Last-Translator: Christian Spaan <gyges@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/"
"de/)\n"
"Language: de\n"
@@ -90,7 +92,7 @@ msgid ""
"persistence feature is activated."
msgstr ""
"Wenn Sie Tails neu starten, werden alle Daten von Electrum gelöscht, "
-"inklusive Ihrer Bitcoin Geldbörse. Wir empfehlen endringlich, Electrum mit "
+"inklusive Ihrer Bitcoin-Geldbörse. Wir empfehlen eindringlich, Electrum mit "
"aktiviertem beständigen Speicherbereich zu nutzen."
#: config/chroot_local-includes/usr/local/bin/electrum:18
@@ -274,7 +276,7 @@ msgstr "Andere Nachrichten von GnuPG:"
#: config/chroot_local-includes/usr/local/bin/icedove:18
msgid "The <b>Claws Mail</b> persistence feature is activated."
-msgstr ""
+msgstr "Die Persistenzfunktion von <b>Claws Mail</b> ist aktiviert."
#: config/chroot_local-includes/usr/local/bin/icedove:20
msgid ""
@@ -282,10 +284,13 @@ msgid ""
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
msgstr ""
+"Falls Sie gespeicherte E-Mails in <b>Claws Mail</b> haben, sollten Sie noch "
+"vor dem Start von <b>Icedove</b> <a href='https://tails.boum.org/doc/"
+"anonymous_internet/claws_mail_to_icedove'>Ihre Daten migrieren</a>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
-msgstr ""
+msgstr "Neustart"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74
#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -362,7 +367,7 @@ msgstr "Diese Tails-Version weist Sicherheitslücken auf:"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:156
msgid "Known security issues"
-msgstr ""
+msgstr "Bekannte Sicherheitsprobleme"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
#, sh-format
@@ -370,35 +375,33 @@ msgid "Network card ${nic} disabled"
msgstr "Netzwerkkarte ${nic} deaktiviert"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} "
-"(${nic}). Deshalb ist es jetzt temporär deaktiviert.\n"
-"Sie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. "
-"Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/"
-"mac_spoofing.de.html'>Dokumentation</a> ansehen."
+"Bei der Netzwerkkarte ${nic_name} (${nic}) schlug die MAC-Manipulation fehl, "
+"sie wurde daher temporär deaktiviert.\n"
+"Sie sollten eventuell die MAC-Manipulation deaktivieren und Tails neu "
+"starten. "
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
msgid "All networking disabled"
msgstr "Alle Netzwerke deaktiviert"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"MAC-Manipulation schlug bei folgender Netzwerkkarte fehl: ${nic_name} "
-"(${nic}). Die Fehlerbehebung schlug ebenfalls fehl. Deshalb sind jetzt alle "
-"Verbindungen deaktiviert.\n"
-"Sie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. "
-"Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/"
-"mac_spoofing.de.html'>Dokumentation</a> ansehen."
+"Bei der Netzwerkkarte ${nic_name} (${nic}) schlugen die MAC-Manipulation und "
+"die Fehlerbehebung fehl. Deshalb wurden jetzt alle Verbindungen "
+"deaktiviert. \n"
+"Sie sollten eventuell die MAC-Manipulation deaktivieren und Tails neu "
+"starten."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
@@ -449,39 +452,38 @@ msgstr ""
"überwachen, was Sie in Tails machen."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
-#, fuzzy
msgid "Warning: non-free virtual machine detected!"
-msgstr "Warnung: Virtuelle Maschine erkannt!"
+msgstr "Warnung: nicht-freie virtuelle Maschine erkannt!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
-#, fuzzy
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails. Only free software can be considered "
"trustworthy, for both the host operating system and the virtualization "
"software."
msgstr ""
-"Sowohl das Wirtsbetriebssystem als auch die Virtualisierungsanwendung können "
-"überwachen, was Sie in Tails machen."
+"Sowohl das Wirts-Betriebssystem als auch die Virtualisierungs-Anwendung "
+"können überwachen, was Sie in Tails machen. Nur Freie Software kann sowohl "
+"für das Wirts-Betriebssystem als auch für die Virtualisierungs-Anwendung als "
+"vertrauenswürdig gelten."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
-#, fuzzy
msgid "Learn more"
-msgstr "Mehr über Tails erfahren"
+msgstr "Mehr erfahren"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor ist nicht bereit"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor ist nicht bereit. Möchten Sie den Tor-Browser trotzdem starten?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Tor-Browser starten"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Abbrechen"
@@ -490,15 +492,14 @@ msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Möchten Sie wirklich den unsicheren Browser starten?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
-#, fuzzy
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
msgstr ""
"Die Netzwerkaktivität im unsicheren Browser ist <b>nicht anonym</b>. "
-"Benutzen Sie den unsicheren Browser nur wenn nötig, wie z.B. wenn Sie sich "
-"einloggen oder ihre Internetverbindung aktivieren müssen."
+"Benutzen Sie den unsicheren Browser nur wenn nötig, z.B. wenn Sie sich "
+"einloggen oder registrieren müssen, um Ihre Internetverbindung zu aktivieren."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
msgid "Starting the Unsafe Browser..."
@@ -664,31 +665,3 @@ msgstr "Unsicherer Internet-Browser"
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Tails-spezifische Werkzeuge"
-
-#~ msgid "Shutdown Immediately"
-#~ msgstr "Sofort herunterfahren"
-
-#~ msgid "Reboot Immediately"
-#~ msgstr "Sofort neustarten"
-
-#~ msgid "Network connection blocked?"
-#~ msgstr "Netzwerkverbindung blockiert?"
-
-#~ msgid ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-#~ msgstr ""
-#~ "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der "
-#~ "MAC-Manipulationsfunktion liegen. Für weitere Informationen lesen Sie "
-#~ "bitte die <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/"
-#~ "startup_options/mac_spoofing.de.html#blocked\\\">Dokumentation zur MAC-"
-#~ "Manipulation</a>."
-
-#~ msgid ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
-#~ msgstr ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.de.html#security'>Mehr erfahren...</a>"
diff --git a/po/el.po b/po/el.po
index 50a0c16..2e9f0b8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-10-08 20:37+0000\n"
"Last-Translator: Ilias Giannaros <iliasgnrs@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
@@ -467,19 +467,19 @@ msgstr ""
msgid "Learn more"
msgstr "Μάθετε περισσότερα σχετικά με Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Το Tor δεν είναι έτοιμο"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Το Tor δεν είναι έτοιμο. Εκκίνηση του Tor Browser όπως και να 'χει;"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Εκκίνηση του Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Άκυρον"
diff --git a/po/en_GB.po b/po/en_GB.po
index 1434285..0ceb721 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Andi Chandler <andi@gowling.com>, 2014-2015
+# Andi Chandler <andi@gowling.com>, 2014-2016
# Billy Humphreys <sysop@enderbbs.enderservices.tk>, 2014
# newharha ehrara <dbybgohg@yomail.info>, 2015
# Richard Shaylor <rshaylor@me.com>, 2014
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2015-11-02 00:10+0000\n"
-"Last-Translator: newharha ehrara <dbybgohg@yomail.info>\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-01 12:49+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
"torproject/language/en_GB/)\n"
"Language: en_GB\n"
@@ -257,7 +257,7 @@ msgstr "Other messages provided by GnuPG:"
#: config/chroot_local-includes/usr/local/bin/icedove:18
msgid "The <b>Claws Mail</b> persistence feature is activated."
-msgstr ""
+msgstr "The <b>Claws Mail</b> persistence feature is activated."
#: config/chroot_local-includes/usr/local/bin/icedove:20
msgid ""
@@ -265,10 +265,13 @@ msgid ""
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
msgstr ""
+"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
+"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
+"data</a> before starting <b>Icedove</b>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
-msgstr ""
+msgstr "Restart"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74
#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -345,7 +348,7 @@ msgstr "This version of Tails has known security issues:"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:156
msgid "Known security issues"
-msgstr ""
+msgstr "Known security issues"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
#, sh-format
@@ -353,7 +356,7 @@ msgid "Network card ${nic} disabled"
msgstr "Network card ${nic} disabled"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
@@ -361,16 +364,14 @@ msgid ""
msgstr ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
-"You might prefer to restart Tails and disable MAC spoofing. See the <a "
-"href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-"mac_spoofing.en.html'>documentation</a>."
+"You might prefer to restart Tails and disable MAC spoofing."
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
msgid "All networking disabled"
msgstr "All networking disabled"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
@@ -378,9 +379,7 @@ msgid ""
msgstr ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
-"You might prefer to restart Tails and disable MAC spoofing. See the <a "
-"href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en."
-"html'>documentation</a>."
+"You might prefer to restart Tails and disable MAC spoofing."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
@@ -427,39 +426,38 @@ msgstr ""
"monitor what you are doing in Tails."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
-#, fuzzy
msgid "Warning: non-free virtual machine detected!"
-msgstr "Warning: virtual machine detected!"
+msgstr "Warning: non-free virtual machine detected!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
-#, fuzzy
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails. Only free software can be considered "
"trustworthy, for both the host operating system and the virtualization "
"software."
msgstr ""
-"Both the host operating system and the virtualization software are able to "
-"monitor what you are doing in Tails."
+"Both the host operating system and the virtualisation software are able to "
+"monitor what you are doing in Tails. Only free software can be considered "
+"trustworthy, for both the host operating system and the virtualisation "
+"software."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
-#, fuzzy
msgid "Learn more"
-msgstr "Learn more about Tails"
+msgstr "Learn more"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor is not ready"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor is not ready. Start Tor Browser anyway?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Start Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Cancel"
@@ -468,14 +466,13 @@ msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Do you really want to launch the Unsafe Browser?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
-#, fuzzy
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
msgstr ""
-"Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use "
-"the Unsafe Browser if necessary, for example if you have to login or "
+"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
+"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
@@ -641,30 +638,3 @@ msgstr "Unsafe Web Browser"
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Tails specific tools"
-
-#~ msgid "Shutdown Immediately"
-#~ msgstr "Shutdown Immediately"
-
-#~ msgid "Reboot Immediately"
-#~ msgstr "Reboot Immediately"
-
-#~ msgid "Network connection blocked?"
-#~ msgstr "Network connection blocked?"
-
-#~ msgid ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-#~ msgstr ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-
-#~ msgid ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
-#~ msgstr ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
diff --git a/po/es.po b/po/es.po
index 7f5d273..d5bfed6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 14:12+0000\n"
"Last-Translator: strel\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
@@ -458,19 +458,19 @@ msgstr ""
msgid "Learn more"
msgstr "Leer más"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor no está listo"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor no está listo. ¿Iniciar el Navegador Tor de todos modos?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Iniciar Navegador Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Cancelar"
diff --git a/po/fa.po b/po/fa.po
index ad2aa1f..7dc4de2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-11-11 18:08+0000\n"
"Last-Translator: Farshad Gh <farshad73@gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/"
@@ -469,19 +469,19 @@ msgstr ""
msgid "Learn more"
msgstr "اطلاعات بیشتر در مورد Tails را یاد بگیرید"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "تور آماده نیست"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "تور آماده نیست. مرورگر تور به هر حال اجرا شود؟"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "اجرای مرورگر تور"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "لغو"
diff --git a/po/fi.po b/po/fi.po
index 1431e72..b2b36c4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-07-25 07:32+0000\n"
"Last-Translator: Thomas <lab777ee@hotmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/"
@@ -452,19 +452,19 @@ msgstr ""
msgid "Learn more"
msgstr "Opi lisää Tails-ohjelmasta"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor ei ole valmis"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor ei ole valmis. Käynnistetäänkö Tor-selain siitä huolimatta?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Käynnistä Tor-selain"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Peruuta"
diff --git a/po/fr.po b/po/fr.po
index b1d6b98..1023b3b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-11-18 16:36+0100\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,19 +455,19 @@ msgstr ""
msgid "Learn more"
msgstr "En apprendre davantage sur Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor n'est pas prêt"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor n'est pas prêt. Démarrer Tor Browser malgré tout ?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Démarrer Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Annuler"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 13dda51..5784728 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 18:13+0000\n"
"Last-Translator: Trans-fr\n"
"Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/"
@@ -454,19 +454,19 @@ msgstr ""
msgid "Learn more"
msgstr "En apprendre davantage"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor n'est pas prêt"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor n'est pas prêt. Démarrer le navigateur Tor quand même?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Démarrer le navigateur Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Annuler"
diff --git a/po/he.po b/po/he.po
index 63ace0f..7f8f8e0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-10-09 11:44+0000\n"
"Last-Translator: Johnny Diralenzo\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/"
@@ -435,19 +435,19 @@ msgstr ""
msgid "Learn more"
msgstr "למד עוד על Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor עוד לא מוכן"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor עוד לא מוכן. הפעל את דפדפן Tor בכל זאת?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "הפעל את דפדפן Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "ביטול"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 8342c72..987dee6 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-09-23 11:21+0000\n"
"Last-Translator: skiddiep <lyricaltumor@gmail.com>\n"
"Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/"
@@ -455,19 +455,19 @@ msgstr ""
msgid "Learn more"
msgstr "Saznajte više o Tails-u"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nije spreman"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nije spreman. Svejedno pokrenuti Tor Preglednik?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Pokreni Tor Preglednik"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Otkaži"
diff --git a/po/hu.po b/po/hu.po
index 1d26c7e..8e37ea3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-15 18:27+0000\n"
"Last-Translator: Robert Zsolt <physx_ms@outlook.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/"
@@ -457,19 +457,19 @@ msgstr ""
msgid "Learn more"
msgstr "További információ"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "A Tor még nem áll készen a működésre"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "A Tor még nem áll készen a működésre. Mindenképp el szeretné indítani?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "A Tor Browser indítása"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Mégse"
diff --git a/po/id.po b/po/id.po
index a6c9b97..d96d16e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-21 09:16+0000\n"
"Last-Translator: zk <zamani.karmana@gmail.com>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/"
@@ -453,19 +453,19 @@ msgstr ""
msgid "Learn more"
msgstr "Pelajari lebih lanjut"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor belum siap"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor belum siap. Tetap jalankan peramban Tor?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Mulai peramban Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Batal"
diff --git a/po/it.po b/po/it.po
index b57d2fd..66e29b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-25 00:17+0000\n"
"Last-Translator: Giuseppe Pignataro <rogepix@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/"
@@ -462,19 +462,19 @@ msgstr ""
msgid "Learn more"
msgstr "Leggi di più"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor non è pronto"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor non è pronto. Avviare comunque il Tor Browser?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Avvia Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Annulla"
diff --git a/po/ja.po b/po/ja.po
index 18df6e9..d5948e6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-08-29 06:11+0000\n"
"Last-Translator: タカハシ <indexial@outlook.jp>\n"
"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/"
@@ -448,19 +448,19 @@ msgstr ""
msgid "Learn more"
msgstr "Tails について詳しく知る"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor は準備出来ていません"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor は準備出来ていません。とにかく Tor Browser を起動しますか?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Tor Browser を起動"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "キャンセル"
diff --git a/po/km.po b/po/km.po
index b918bb0..6bbc04a 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2014-06-10 02:40+0000\n"
"Last-Translator: Sokhem Khoem <sokhem@open.org.kh>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/"
@@ -428,19 +428,19 @@ msgstr ""
msgid "Learn more"
msgstr "ស្វែងយល់​បន្ថែម​អំពី Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor គឺ​មិនទាន់​រួចរាល់​ទេ"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor គឺ​មិនទាន់​រួចរាល់​ទេ។ ចាប់ផ្ដើម​កម្មវិធី​អ៊ីនធឺណិត Tor ឬ?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "ចាប់ផ្ដើម​កម្មវិធី​អ៊ីនធឺណិត Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "បោះបង់"
diff --git a/po/ko.po b/po/ko.po
index 5b795f3..09919f3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-02-24 15:42+0000\n"
"Last-Translator: Sungjin Kang <potopro@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/"
@@ -442,19 +442,19 @@ msgstr ""
msgid "Learn more"
msgstr "Tails에 대해서 더 알아보기"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor 준비 안 됨"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor는 준비 안 됐는데, 그래도 Tor 브라우저를 실행할까요?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Tor 브라우저 시작"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "취소"
diff --git a/po/lv.po b/po/lv.po
index 334ad01..9d33257 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-12-17 17:06+0000\n"
"Last-Translator: Ojārs Balcers <ojars.balcers@gmail.com>\n"
"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/"
@@ -442,19 +442,19 @@ msgstr ""
msgid "Learn more"
msgstr "Uzzināt vairāk"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nav sagatavots."
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nav sagatavots. Vai, neskatoties uz to, startēt Pārlūku Tor?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Startēt Pārlūku Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Atcelt"
diff --git a/po/nb.po b/po/nb.po
index 8357906..db08304 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 22:45+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/"
@@ -450,19 +450,19 @@ msgstr ""
msgid "Learn more"
msgstr "Lær mer"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor er ikke klar"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor er ikke klar. Starte Tor Browser uansett?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Start Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Avbryt"
diff --git a/po/nl.po b/po/nl.po
index 6d00ef1..ba45f81 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-20 19:40+0000\n"
"Last-Translator: Volluta <volluta@tutanota.com>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
@@ -462,19 +462,19 @@ msgstr ""
msgid "Learn more"
msgstr "Meer info"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor is niet klaar"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor is niet klaar. De Tor Browser toch starten?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Start de Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Annuleren"
diff --git a/po/pl.po b/po/pl.po
index 755387f..157cce2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-16 21:04+0000\n"
"Last-Translator: Jakub Goldberg <zenji.yamada.nihon@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/"
@@ -460,19 +460,19 @@ msgstr ""
msgid "Learn more"
msgstr "Dowiedz się więcej"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nie jest gotowy"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nie jest gotowy. Uruchomić Tor Browser mimo tego?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Start Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Anuluj"
diff --git a/po/pt.po b/po/pt.po
index b834a3c..a46e169 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-11-01 17:50+0000\n"
"Last-Translator: MMSRS <h_manuela_rodsilva@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/"
@@ -457,19 +457,19 @@ msgstr ""
msgid "Learn more"
msgstr "Saber mais sobre Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "O Tor não está pronto"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "O Tor não está pronto. Deseja iniciar o Navegador Tor na mesma?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Iniciar o Navegador Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Cancelar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f8ada37..f6b5a64 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Communia <ameaneantie@riseup.net>, 2013-2015
+# Communia <ameaneantie@riseup.net>, 2013-2016
# carlo giusepe tadei valente sasaki <carlo.gt.valente@gmail.com>, 2014
# Danton Medrado, 2015
# Eduardo Bonsi, 2013-2014
@@ -11,17 +11,19 @@
# Gilberto Coutinho <gilberto.jsc@gmail.com>, 2015
# Isabel Ferreira, 2014
# john smith, 2015
+# Leonardo Vieira de Souza <leonardo.v.souza@gmail.com>, 2016
# Lucas Possatti, 2014
# Luciana Dark Blue <lucianadarkblue@gmail.com>, 2015
# Matheus Boni Vicari <matheus_boni_vicari@hotmail.com>, 2014
# Matheus Martins, 2013
+# Wagner Marques Oliveira <wagnermarques00@hotmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2015-11-23 10:38+0000\n"
-"Last-Translator: Danton Medrado\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-01-30 12:31+0000\n"
+"Last-Translator: Communia <ameaneantie@riseup.net>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/"
"language/pt_BR/)\n"
"Language: pt_BR\n"
@@ -263,7 +265,7 @@ msgstr "Outras mensagens fornecidas pelo GnuPG:"
#: config/chroot_local-includes/usr/local/bin/icedove:18
msgid "The <b>Claws Mail</b> persistence feature is activated."
-msgstr ""
+msgstr "O recurso persistente <b>Claws Mail</b> foi ativado."
#: config/chroot_local-includes/usr/local/bin/icedove:20
msgid ""
@@ -271,10 +273,13 @@ msgid ""
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
msgstr ""
+"Se você tem emails salvos no <b>Claws Mail</b>, você deve <a href='https://"
+"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrar seus "
+"dados</a> antes de iniciar o <b>Icedove</b>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
-msgstr ""
+msgstr "Reiniciar"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74
#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -351,7 +356,7 @@ msgstr "Esta versão do Tails tem problemas de segurança conhecidos:"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:156
msgid "Known security issues"
-msgstr ""
+msgstr "Problemas de seguranca conhecidos"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
#, sh-format
@@ -359,35 +364,33 @@ msgid "Network card ${nic} disabled"
msgstr "Placa de rede ${nic} desabilitada"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"A burla de identidade MAC falhou para a placa de rede ${nic_name} (${nic}), "
-"portanto, está temporariamente desabilitada.\n"
-"Talvez seja melhor reiniciar o Tails e desabilitar a burla de identidade "
-"MAC. Veja a <a href='file:///usr/share/doc/tails/website/doc/first_steps/"
-"startup_options/mac_spoofing.en.html'>documentação</a>."
+"A máscara de identidade MAC falhou para a placa de rede ${nic_name} "
+"(${nic}), portanto, está temporariamente desabilitada.\n"
+"Talvez seja melhor reiniciar o Tails e desabilitar a máscara de identidade "
+"MAC."
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
msgid "All networking disabled"
msgstr "Todas as redes foram desabilitadas"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"A burla de identidade MAC falhou para a placa de rede ${nic_name} (${nic}). "
-"A recuperação do erro também falhou. Assim, todas as redes estão "
-"desabilitadas.\n"
-"talvez seja melhor reiniciar o Tails e desabilitar a burla de identidade "
-"MAC. Veja a <a href='file:///usr/share/doc/first_steps/startup_options/"
-"mac_spoofing.en.html'>documentação</a>."
+"A máscara de identidade MAC falhou para a placa de rede ${nic_name} "
+"(${nic}). A recuperação do erro também falhou, portanto, toda a navegação "
+"está desabilitada.\n"
+"Talvez seja melhor reiniciar o Tails e desabilitar a máscara de identidade "
+"MAC."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
@@ -434,39 +437,38 @@ msgstr ""
"são capazes de monitorar as suas atividades no Tails."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
-#, fuzzy
msgid "Warning: non-free virtual machine detected!"
-msgstr "Aviso: máquina virtual detectada!"
+msgstr "Aviso: máquina virtual non-free detectada!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
-#, fuzzy
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails. Only free software can be considered "
"trustworthy, for both the host operating system and the virtualization "
"software."
msgstr ""
-"Tanto o sistema operacional hospedeiro quanto o programa de virtualização "
-"são capazes de monitorar as suas atividades no Tails."
+"Tando sistema operacional hospedeiro quanto o programa de virtualização "
+"podem monitorar a sua atividade no Tails. Somente os programas livres podem "
+"ser considerados confiáveis, em relação ao sistema operacional hospedeiro e "
+"ao programa de virtualização. "
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
-#, fuzzy
msgid "Learn more"
-msgstr "Saiba mais sobre o Tails"
+msgstr "Saiba mais"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "O Tor não está pronto"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "O Tor não está pronto. Iniciar o Navegador Tor assim mesmo?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Iniciar o Navegador Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Cancelar"
@@ -475,16 +477,14 @@ msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Você realmente deseja iniciar o Navegador não-confiável?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
-#, fuzzy
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
msgstr ""
-"A atividade de rede que utiliza um Navegador não-confiável <b>não é anônima</"
-"b>. Utilize um Navegador não-confiável somente se for necessário, por "
-"exemplo, se você tiver que se identificar ou se registrar para ativar a sua "
-"conexão a Internet."
+"A atividade de rede no Navegador é <b>não é anônima</b>.\\nUse o Navegador "
+"somente se for necessário, por exemplo\\nse você tiver de fazer login ou "
+"registrar para ativar asua conexão de Internet.."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
msgid "Starting the Unsafe Browser..."
@@ -561,7 +561,7 @@ msgid ""
"for more information."
msgstr ""
"Algo de errado aconteceu quando o I2P estava iniciando. Verifique os "
-"registros em /var/log/i2p para mais informação."
+"registros em /var/log/i2p para mais informações."
#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53
msgid "I2P's router console is ready"
@@ -649,31 +649,3 @@ msgstr "Navegador não-confiável"
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Ferramentas específicas do Tails"
-
-#~ msgid "Shutdown Immediately"
-#~ msgstr "Desligar imediatamente"
-
-#~ msgid "Reboot Immediately"
-#~ msgstr "Reiniciar imediatamente"
-
-#~ msgid "Network connection blocked?"
-#~ msgstr "Conexão de rede bloqueada?"
-
-#~ msgid ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-#~ msgstr ""
-#~ "Aparentemente você foi bloqueado da rede. Isto pode estar relacionado à "
-#~ "funcionalidade de burla de identidade MAC. Para mais informações, "
-#~ "consulte a <a href=\\\"file:///usr/share/doc/tails/website/doc/"
-#~ "first_steps/startup_options/mac_spoofing.en.html#blocked\\\"> "
-#~ "documentação sobre burla de identidade MAC</a>."
-
-#~ msgid ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
-#~ msgstr ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Saiba mais...</a>"
diff --git a/po/ro.po b/po/ro.po
index e9c764e..1995a36 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,6 +8,7 @@
# devod <ipawnyou@icloud.com>, 2015
# Di N., 2015
# Draga Bianca - Madalina <dragabianca@yahoo.com>, 2014
+# kyx <mihaidiaconu@gmail.com>, 2016
# Nicola Radu <estonyte@yahoo.com>, 2014
# Paul Ionut Anton, 2014
# Roxana Ardelean <roxana.ene@gmail.com>, 2014
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2015-10-27 09:13+0000\n"
-"Last-Translator: Di N.\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-01-30 11:34+0000\n"
+"Last-Translator: kyx <mihaidiaconu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/"
"ro/)\n"
"Language: ro\n"
@@ -277,7 +278,7 @@ msgstr "Alte mesaje oferite de GnuPG"
#: config/chroot_local-includes/usr/local/bin/icedove:18
msgid "The <b>Claws Mail</b> persistence feature is activated."
-msgstr ""
+msgstr "Caracteristica persistență a <b>Claws Mail</b> este activată."
#: config/chroot_local-includes/usr/local/bin/icedove:20
msgid ""
@@ -285,10 +286,13 @@ msgid ""
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
msgstr ""
+"Dacă aveți email-uri salvate în <b>Claws Mail</b>, trebuie să <a "
+"href='https://tails.boum.org/doc/anonymous_internet/"
+"claws_mail_to_icedove'>mutați datele</a> înainte să porniți <b>Icedove</b>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
-msgstr ""
+msgstr "Restart"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74
#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -364,7 +368,7 @@ msgstr "Această versiune de Tail are probleme de securitate cunoscute:"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:156
msgid "Known security issues"
-msgstr ""
+msgstr "Probleme de securitate cunoscute"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
#, sh-format
@@ -372,35 +376,32 @@ msgid "Network card ${nic} disabled"
msgstr "Placa de rețea ${nic} dezactivată"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"MAC spoofing a eșuat pentru cardul de rețea ${nic_name} (${nic}) așadar este "
-"momentan dezactivat. \n"
-"Este recomandat să reinițializezi Tails și să dezactivezi MAC spoofing. Vezi "
-"<a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-"mac_spoofing.en.html'>documentation</a>."
+"Spoofing-ul MAC nu a reușit pentru placa de rețea ${nic_name} (${nic}) "
+"aștfel aceasta este temporar dezactivată.\n"
+"Poate preferați să restartați Tails și să dezactivați spoofing-ul MAC."
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
msgid "All networking disabled"
msgstr "Toate rețelele sunt dezactivate"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"MAC spoofing a eșuat pentru cardul de rețea ${nic_name} (${nic}). "
-"Recuperarea în urma erorii a eșuat de asemenea, așadar activitatea a fost "
-"dezactivată.\n"
-"Este recomandat să reinițializezi Tails și să dezactivezi MAC spoofing. Vezi "
-"<a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en."
-"html'>documentation</a>."
+"Spoofing-ul MAC a eșuat pentru placa de rețea ${nic_name} (${nic}). Și "
+"recuperarea erorii a eșuat de asemenea astfel încât toate rețelele sunt "
+"dezactivate.\n"
+"\n"
+"Ați putea alege să restartați Tails și să dezactivați spoofing-ul MAC."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
@@ -446,39 +447,38 @@ msgstr ""
"faceți în Tails."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
-#, fuzzy
msgid "Warning: non-free virtual machine detected!"
-msgstr "Atenție: s-a detectat o mașină virtuală!"
+msgstr "Avertisment: o mașina virtuală care nu este gratuită a fost detectată!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
-#, fuzzy
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails. Only free software can be considered "
"trustworthy, for both the host operating system and the virtualization "
"software."
msgstr ""
-"Atât sistemul de operare gazdă cât și aplicația virtuală pot monitoriza ce "
-"faceți în Tails."
+"Atât sistemul de operar gazdă cât și software-ul de virtualizare sunt "
+"capabile să monitorizeze ce faceți în Tails. Numai software-ul gratuit poate "
+"fi considerat demn de încredere, atât pentru sistemul de operare gazdă cât "
+"și pentru software-ul de virtualizare."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
-#, fuzzy
msgid "Learn more"
-msgstr "Învățați mai multe despre Tails"
+msgstr "Află mai multe"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nu este pregatit"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nu este pregătit. Se pornește navigatorul Tor oricum?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Porniti Browserul Tor"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Anulare"
@@ -487,14 +487,14 @@ msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Sigur vreti sa lansati browser-ul neprotejat? "
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
-#, fuzzy
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
msgstr ""
-"Activitatea internetului in browser-ul neprotejat este <b>, nu anonimul </"
-"b>. Folositi doar"
+"Activitatea de rețea în Unsafe Browser <b>nu este anonimă</b>.\\n Folosiți "
+"Unsafe Browser numai dacă este necesar, de exemplu\\nif trebuie să vă "
+"autentificați sau ănregistrați pentru activarea conexiunii dvs. la internet."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
msgid "Starting the Unsafe Browser..."
@@ -662,30 +662,3 @@ msgstr "Browser Web neprotejat"
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Unelte specifice Tails"
-
-#~ msgid "Shutdown Immediately"
-#~ msgstr "Inchide imediat"
-
-#~ msgid "Reboot Immediately"
-#~ msgstr "Repornește imediat"
-
-#~ msgid "Network connection blocked?"
-#~ msgstr "Conexiune la internet blocata?"
-
-#~ msgid ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-#~ msgstr ""
-#~ "Se pare ca aveti accesul blocat la internet. Poate fi din cauza funcției "
-#~ "de falsificare MAC. Pentru mai multe informații, vedeți <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">documentație falsificare MAC</a>."
-
-#~ msgid ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
-#~ msgstr ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'> Află mai multe...</a>"
diff --git a/po/ru.po b/po/ru.po
index f8fce12..b524967 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 14:07+0000\n"
"Last-Translator: Antony A. Tolmachev <a.tolmachev@richart-consalt.ru>\n"
"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/"
@@ -479,19 +479,19 @@ msgstr ""
msgid "Learn more"
msgstr "Подробнее "
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor не готов"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor не готов. Всё равно запустить Tor Browser?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Запустить Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Отмена"
diff --git a/po/sk.po b/po/sk.po
index 15ffb71..3626b39 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-08-04 20:56+0000\n"
"Last-Translator: Stanislav Tomáš <stanislav.tomas@hotmail.sk>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/"
@@ -455,19 +455,19 @@ msgstr ""
msgid "Learn more"
msgstr "Dozvedieť sa viac o Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nie je pripravený"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nie je pripravený. Spustiť Tor Browser aj tak?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Spustiť Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Zrušiť"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index cadff03..271839f 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2014-07-27 11:30+0000\n"
"Last-Translator: once\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/"
@@ -446,19 +446,19 @@ msgstr ""
msgid "Learn more"
msgstr "Zistiť viac o Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor nie je pripravený"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nie je pripravený. Spustiť Tor Browser aj napriek tomu?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Spustiť Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Zrušiť"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 8648636..9e41321 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-02-12 14:52+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/"
@@ -449,19 +449,19 @@ msgstr ""
msgid "Learn more"
msgstr "Več o Sledi"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor ni pripravljen"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor ni pripravljen. Zaženem Tor brskalnik vseeno?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Zagon Tor brskalnik"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Opusti"
diff --git a/po/sq.po b/po/sq.po
index 68316e6..a86b3a3 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-09-25 11:52+0000\n"
"Last-Translator: Bujar Tafili\n"
"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/"
@@ -451,19 +451,19 @@ msgstr ""
msgid "Learn more"
msgstr "Mësoni më shumë rreth Tails"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor s'është gati"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor s'është gati. Do ta nisni Tor Browser gjithsesi?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Niseni Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Anuloni"
diff --git a/po/sr.po b/po/sr.po
index 2fe0080..2b60ade 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2015-03-29 20:33+0000\n"
"Last-Translator: JanaDi <dijana1706@gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/"
@@ -470,19 +470,19 @@ msgstr ""
msgid "Learn more"
msgstr "Научите више о Tails-у."
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Тор није спреман"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Тор није спреман. Ипак покренути Тор?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Покрени Тор Браузер"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Откажи"
diff --git a/po/sv.po b/po/sv.po
index 7cef65d..58937e9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-17 17:54+0000\n"
"Last-Translator: Martin <mhilgendrf@aol.com>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/"
@@ -451,19 +451,19 @@ msgstr ""
msgid "Learn more"
msgstr "Mer information"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor är inte redo"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor är inte redo. Starta Tor Browser ändå?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Starta Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Avbryt"
diff --git a/po/tails.pot b/po/tails.pot
index d2c8774..4bd3c72 100644
--- a/po/tails.pot
+++ b/po/tails.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+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"
@@ -388,19 +388,19 @@ msgstr ""
msgid "Learn more"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a99e92b..7d1fd26 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 09:47+0000\n"
"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/"
@@ -462,19 +462,19 @@ msgstr ""
msgid "Learn more"
msgstr "Daha fazla bilgi"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor hazır değil"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor hazır değil. Gene de Tor Browser başlatılsın mı?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Tor Browser Başlatılsın"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "İptal"
diff --git a/po/uk.po b/po/uk.po
index 9fff987..dcc5462 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
# LinuxChata, 2014
# Oleksii Golub <sclub2018@yandex.ua>, 2015
# Pinro Lomil <lomil97@gmail.com>, 2013
-# Vira Motorko <ato4ka@i.ua>, 2015
+# Vira Motorko <ato4ka@i.ua>, 2015-2016
# Yasha <yasha88888@hotmail.com>, 2015
# Андрій Бандура <andriykopanytsia@gmail.com>, 2014
# Владислав <vladyslavpoghrebniakov@gmail.com>, 2014
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2015-12-05 09:10+0000\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-05 14:05+0000\n"
"Last-Translator: Vira Motorko <ato4ka@i.ua>\n"
"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/"
"uk/)\n"
@@ -274,7 +274,7 @@ msgstr "Інші повідомлення, що надаються GnuPG:"
#: config/chroot_local-includes/usr/local/bin/icedove:18
msgid "The <b>Claws Mail</b> persistence feature is activated."
-msgstr ""
+msgstr "Увімкнено функцію стійкості <b>Claws Mail</b>."
#: config/chroot_local-includes/usr/local/bin/icedove:20
msgid ""
@@ -282,10 +282,14 @@ msgid ""
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
msgstr ""
+"Якщо Ваші електронні листи зберігаються у <b>Claws Mail</b>, Вам варто <a "
+"href='https://tails.boum.org/doc/anonymous_internet/"
+"claws_mail_to_icedove'>мігрувати свої дані</a> перед початком використання "
+"<b>Icedove</b>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
-msgstr ""
+msgstr "Перезавантажити"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74
#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -362,7 +366,7 @@ msgstr "Ця версія Tails має відомі проблеми безпе
#: config/chroot_local-includes/usr/local/bin/tails-security-check:156
msgid "Known security issues"
-msgstr ""
+msgstr "Відомі проблеми безпеки"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
#, sh-format
@@ -370,33 +374,30 @@ msgid "Network card ${nic} disabled"
msgstr "Мережева карта ${nic} відключена"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
"temporarily disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
"Підміна MAC-адреси не вдалася для мережевої карти ${nic_name} (${nic}), тому "
-"вона тимчасово вимкнена. Можливо, ви віддасте перевагу перевантаженню Tails "
-"і вимкненню підміни MAC. Див. <a href='file:///usr/share/doc/tails/website/"
-"doc/first_steps/startup_options/mac_spoofing.en.html'>документацію</a>."
+"вона тимчасово вимкнена. \n"
+"Можливо, ви віддасте перевагу перевантаженню Tails і вимкненню підміни MAC."
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
msgid "All networking disabled"
msgstr "Всі налаштування мережі вимкнені"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
"recovery also failed so all networking is disabled.\n"
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
-"Підміна MAC не вдалася для мережевої карти${nic_name} (${nic}). Помилку не "
+"Підміна MAC не вдалася для мережевої карти ${nic_name} (${nic}). Помилку не "
"вдалося виправити, тому мережа повністю вимкнена.\n"
"Можливо, ви віддасте перевагу перевантаженню Tails і вимкненню підміни MAC. "
-"Див. <a href= \" file:///usr/share/doc/решка/сайті/doc/first_steps/"
-"startup_options/mac_spoofing.en.html'>документацію</a>."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
@@ -444,12 +445,10 @@ msgstr ""
"контролювати те, що Ви робите в Tails."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
-#, fuzzy
msgid "Warning: non-free virtual machine detected!"
-msgstr "Увага: знайдено віртуальну машину!"
+msgstr "Увага: знайдено невільну віртуальну машину!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
-#, fuzzy
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails. Only free software can be considered "
@@ -457,26 +456,27 @@ msgid ""
"software."
msgstr ""
"Операційна система та програмне забезпечення віртуалізації у змозі "
-"контролювати те, що Ви робите в Tails."
+"контролювати те, що Ви робите в Tails. Лише вільне програмне забезпечення "
+"розглядається як варте довіри, як для операційної системи, так і для "
+"програмне забезпечення віртуалізації."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
-#, fuzzy
msgid "Learn more"
-msgstr "Дізнайтеся більше про Tails"
+msgstr "Детальніше"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor не готовий"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor не готовий. Запустити Tor у будь-якому разі?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "Запустити Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "Відмова"
@@ -485,15 +485,15 @@ msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Ви дійсно хочете запустити небезпечний браузер?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
-#, fuzzy
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
msgstr ""
-"Мережева активність Небезпечного Браузера <b>не анонімна</b>. Використовуйте "
-"Небезпечний браузер тільки у разі необхідності, наприклад, якщо Вам потрібно "
-"увійти і зареєструватися для активації Вашого мережного з'єднання."
+"Мережева активність Небезпечного Браузера <b>не анонімна</b>. "
+"\\nВикористовуйте Небезпечний браузер тільки у разі необхідності, наприклад, "
+"якщо Вам потрібно увійти і зареєструватися для активації Вашого мережного "
+"з'єднання."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
msgid "Starting the Unsafe Browser..."
@@ -660,30 +660,3 @@ msgstr "Ненадійний веб-браузер"
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Спеціальні інструменти Tails"
-
-#~ msgid "Shutdown Immediately"
-#~ msgstr "Негайно вимкнути"
-
-#~ msgid "Reboot Immediately"
-#~ msgstr "Негайно перезавантажити"
-
-#~ msgid "Network connection blocked?"
-#~ msgstr "З'єднання з мережею заблоковано?"
-
-#~ msgid ""
-#~ "It looks like you are blocked from the network. This may be related to "
-#~ "the MAC spoofing feature. For more information, see the <a href=\\"
-#~ "\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/"
-#~ "mac_spoofing.en.html#blocked\\\">MAC spoofing documentation</a>."
-#~ msgstr ""
-#~ "Здається, ви заблоковані у мережі. Можливо, це пов'язано із підміною MAC-"
-#~ "адрес. Для отримання додаткової інформації див. <a href=\\\"file:///usr/"
-#~ "share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en."
-#~ "html#blocked\\\">документацію про підміну MAC-адрес</a>."
-
-#~ msgid ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Learn more...</a>"
-#~ msgstr ""
-#~ "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-#~ "virtualization.en.html#security'>Дізнатися більше...</a>"
diff --git a/po/zh.po b/po/zh.po
index 09f5827..3fb1881 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -57,7 +57,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+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"
@@ -445,19 +445,19 @@ msgstr ""
msgid "Learn more"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 698623b..b82ab8b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
"PO-Revision-Date: 2016-01-12 09:41+0000\n"
"Last-Translator: YF <yfdyh000@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/"
@@ -429,19 +429,19 @@ msgstr ""
msgid "Learn more"
msgstr "详细了解"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor 未就绪"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor 未就绪。确定启动 Tor Browser?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "启动 Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "取消"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 89fcc1b..f574757 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2016-01-18 05:01+0000\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-08 04:40+0000\n"
"Last-Translator: Agustín Wu <losangwuyts@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/"
"language/zh_TW/)\n"
@@ -433,19 +433,19 @@ msgstr ""
msgid "Learn more"
msgstr "繼續閱讀"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
msgid "Tor is not ready"
msgstr "Tor 未就緒"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor 未就緒。無論如何啟動 Tor 瀏覽器嗎?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Start Tor Browser"
msgstr "啟動 Tor 瀏覽器"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Cancel"
msgstr "取消"
diff --git a/submodules/jenkins-tools b/submodules/jenkins-tools
-Subproject 8a153139f93387a3584309a287a2a2b3c14d8f9
+Subproject ff06c479edb8d4bc4161e3fd5cf72a50377329e
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 6a5fafd..d8b1ae4 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -6,336 +6,104 @@
## Big picture
+XXX: how do we manage *.dl.amnesia.boum.org DNS?
+
We decided to implement a two-way strategy for this feature:
-* Use JavaScript to modify the link on the download page, so that each
- user is pointed to random mirror.
+* Write dispatcher code, in JavaScript, that DAVE uses to dynamically modify the
+ hostname, in the download link it gets from the ISO description file
+ (IDF), so that each user is pointed to random mirror.
+ - [Git repository](https://git-tails.immerda.ch/mirror-pool-dispatcher/)
- Vanilla JS (no frameworks)
- - Store the JS code and its configuration file in two dedicated
- ikiwiki overlays, for finer-grained access control possibilities
- to it (e.g. we may want to let people who don't have commit access
- to Git maintain the mirrors pool).
- - Configuration for the JS is loaded from JSON file. It attaches
- a weight to each mirror. Weight 0 means that the mirror is
- currently disabled, and will never be redirected to. We're using
- JSON and not YAML to avoid the need to use a third-party parser.
+ - The code must work from inside a Firefox extension (DAVE) at
+ least; ideally it is library code that can also be used from a web
+ page (see below for an actual use case).
+ - Configuration for the JS is loaded from a JSON file hosted on our
+ website.
+ See [[the configuration section|HTTP_mirror_pool#configuration]]
+ for details.
* Keep using DNS to point to 3-5 fast and reliable mirrors. This will
be the fallback for people who do not use JS. So we still need a DNS
dynamic update system; we can simply re-purpose the one we already
have (`dl.amnesia.boum.org`).
-* The ISO verification extension also needs to use mirrors. So, we'll
- be providing library code for it to do the same, internally, as
- a web browser would do when visiting the Tails download page, that
- is replacing the hostname, in a ISO download URL, with a suitable
- mirror's hostname (using the JSON mirror pool configuration file).
+* 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,
+ e.g. non-Firefox browsers, the
+ [[wget download option|install/expert/usb]], and
+ documented download methods that rely on
+ [[!tails_gitweb wiki/src/install/inc/steps/download.inline.html]]?
+ - A first iteration could simply use the DNS pool. This might put
+ too much load on the few servers in it though, so it might only
+ work if we're able to add a few really fast servers in it.
+ - In second iteration, we can use our JavaScript dispatcher code to rewrite the
+ download link on the call for testing web page. If we do this, we
+ need to include our JavaScript library in a dedicated ikiwiki
+ overlay, and load + call it on every page that contains an ISO
+ download link (or simply on _every_ page).
+ - It might be that going straight to the second iteration is simpler
+ in the end. Or, we can forget the non-DAVE dispatcher code and
+ instead put energy into adding very fast and reliable mirrors to
+ the DNS pool, as
+ [is being discussed](https://mailman.boum.org/pipermail/tails-dev/2016-February/010282.html).
+
+<a id="configuration"></a>
+
+# Mirror pool configuration
+
+The client dispatcher code fetches the mirror pool configuration file
+from our website.
+
+The configuration file is written in JSON (and not YAML), to avoid the
+need to use a third-party parser.
+
+The configuration file is stored in
+[[!tails_gitweb_repo mirror-pool desc="a dedicated Git repository"]],
+that is added to our website with the ikiwiki underlay mechanism.
+Using a separate Git repository gives us finer-grained access control
+possibilities in the long run, e.g. we may want to let people who
+don't have commit access to Git maintain the mirrors pool. Note that
+we'll need to serve the configuration file from outside our website if
+we ever want to do so: an _underlay_ can affect our website in ways
+that are probably (almost?) as bad as what one can do with Git access
+to the website itself.
+
+The configuration file is essentially a list of mirrors, and for each
+of them we need a few values:
+
+ * url_prefix: whatever needs to be pre-pended to the path to an ISO
+ (e.g. `/stable/tails-i386-2.0/tails-i386-2.0.iso`) that is shared
+ between all mirrors, to form a complete URL to that ISO; for
+ example:
+ - in the old mirror pool design, this would be
+ `http://dl.amnesia.boum.org/tails`
+ - in the new mirror pool design, this could be e.g.
+ `http://42.dl.amnesia.boum.org/tails` (for mirrors who want to
+ use the unique VirtualHost we provide them), or something they
+ deal with themselves, e.g. `https://mirrors.kernel.org/tails`
+
+ * weight: the probability this mirror has to be picked by the
+ dispatcher code, expressed as a non-negative integer; weight
+ 0 means that the mirror is currently disabled, and will never be
+ redirected to
+
+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).
+
+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.
# Initial research
-The idea I had was to let the server(s) send a reduced list of hosts. Not
-only it would allow to work-around Tor DNS limitations, but also to have
-some weighted round robin, in order to prioritize some high bandwidth
-mirrors, if we choose to.
-
-If I had to mention the ideal design goals for such changes, I would say
-that the more straightforward would be the better for implementation and
-also for maintainability.
-
-## Using DNS
-
-Using DNS seems to be an easy way to do some round robin in low level. It
-allows some kind of transparency to the upper layers protocols and
-distribute the load and to avoid having a single server that can became a
-SPOF.
-
-The following ways are available to implement it:
-
-* CNAME Hacks
-* NS Hacks
-* Modified DNS servers
-
-### CNAME Hacks
-
-As mention by ToBeFree something that can be done is to have different
-pools of servers like:
-
- a.dl.amnesia.boum.org A $MIRROR1
- a.dl.amnesia.boum.org A $MIRROR2
- a.dl.amnesia.boum.org A $MIRROR3
- a.dl.amnesia.boum.org A $MIRROR4
- a.dl.amnesia.boum.org A $MIRROR5
-
- b.dl.amnesia.boum.org A $MIRROR6
- b.dl.amnesia.boum.org A $MIRROR7
-
- dl.amnedia.boum.org CNAME a.dl.amnesia.boum.org
- dl.amnedia.boum.org CNAME b.dl.amnesia.boum.org
-
-Interestingly the requests would be equally distributed betwen a.dl and
-b.dl, thus if their is more mirrors in one name than one other some
-servers would be somehow prioritized. For example: here "a" mirrors will
-share 50% of requests, giving 10% for every host where "b" mirrors will
-share the other 50% of requests betwen two host giving them 25% of
-requests each.
-
-However this kind of CNAME hack is not supported by current DNS
-Servers. Bind 8 used to support it with a [configuration
-option](http://docstore.mik.ua/orelly/networking_2ndEd/dns/ch10_07.htm)
-that has not been ported to bind 9. Neither NSD nor PowerDNS seem to
-support it, and their is no actual data about how resolvers would
-handle this case, so I don't think it is the best option.
-
-### NS Hacks
-
-Following the same idea the dl amnesia.boum.org could be delegated to a
-few different DNS servers, and those servers may have different versions
-of the zone. For example:
-
- dl.amnesia.boum.org NS $DNS1
- dl.amnesia.boum.org NS $DNS2
-
-DNS1 would have a zone similar to a.dl.amnesia.boum.org:
-
- dl.amnesia.boum.org A $MIRROR1
- dl.amnesia.boum.org A $MIRROR2
- dl.amnesia.boum.org A $MIRROR3
- dl.amnesia.boum.org A $MIRROR4
- dl.amnesia.boum.org A $MIRROR5
-
-And DNS2 would have a zone similar to b.dl.amnesia.boum.org:
-
- dl.amnesia.boum.org A $MIRROR6
- dl.amnesia.boum.org A $MIRROR7
-
-In theory it should work (and give almost the same load distribution as
-CNAME hacks, almost as the NS servers will not receive 50% of requests
-because of [[!rfc 5452]]). However, I am not sure that playing with DNS
-inconsistency will be a so good idea, for example for maintainability :)
-
-### Using modified DNS servers
-
-Interestingly Tails is not the first project to be looking how to use DNS
-for load distribution. People already wrote some DNS software designed to
-handle those usecases and return the visitor a reduced list of servers
-according to some rules like weights or geolocalisation. They work by
-delegating a subzone (like dl.amnesia.boum.org) to those servers and with
-zone files containing additionals fields. There is two main softwares for
-those usecases:
-
-* <http://gdnsd.org/> which is available on debian and used for
- example for wikipedia.
-
-* <https://github.com/abh/geodns> that requires manual installation
- and is used for example by pool.ntp.org.
-
-Deploying such software would solve the problem in a more elegant way than
-CNAME or NS hacks. It would require a bit of system administration that
-maybe can be done using some puppet templates in a few Virtal Machines.
-
-## Using HTTP(s)
-
-DNS is not the only way to do some load balancing. It is mostly used for
-low level protocols that don't allow redirects (for example: NTP). As
-content download is already done using HTTP(s). HTTP(s) can be leveraged
-to do this kind of load balancing. It is what is done by sourceforge.net
-as pointed by ToBeFree and by many Linux distributions.
-
-For example using a PHP script (or more complete options such as
-mirrorbrain, thanks Sagi!) that would redirect requests to
-`dl.amnesia.boum.org/$file to $mirror.dl.amnesia.boum.org/$file`
-randomly or according to some additional rules (weights,
-geolocalisation, SSL availability ...).
-
-There is a few drawbacks on this approach:
-
-* It would increase a bit the load on boum.org's server.
-* It would increase the dependency on this server, meaning that it is
- unavailable (down, blocked...), downloads will be blocked (but in this
- case the site will be too).
-* It would require to develop the script or to install one such as
- mirrorbrain (which is feature-full, available as [3rd party Debian
- packages](http://download.opensuse.org/repositories/Apache:/MirrorBrain/),
- and requires PostgreSQL).
-
-On the other side it has a few advantage:
-
-* It will only require a few ~20 lines of PHP script when DNS based
- solutions require to install and maintain additional software and servers.
-* It can allow the script to be personnalised to add some additional rules
- if necessary.
-* As boum.org server will see every requests, it would allow to do some
- stats.
-* It can allow to use $mirror.dl.amnesia.boum.org URLs, allowing to deploy
- SSL certificates easier that if all mirrors use dl.amnesia.boum.org.
-* As ToBeFree mentionned (thanks!) it is also possible to use some client
- side scripts to select the mirror. I would not recommend to rely only on
- this option as it would not work for browsers without scripts, but it can
- be done as a complementary approach, it order to reduce the load and
- dependency to dl.amnesia.boum.org's server.
-
-Thus, if I may, I would like to recommend considering the HTTP(s) option,
-even if it means that I have to write the PHP script by myself or to create
-an easy task entry on the ticket tracker and follow it :)
-
-## Proof of concept: JavaScript + multiple DNS pools / named mirrors
-
-This method can either be used with multiple DNS pools (dl1.amnesia.boum.org, dl2.amnesia.boum.org etc.) or with named mirrors (freiwuppertal.dl.amnesia.boum.org, othermirror.dl.amnesia.boum.org, ...). Using named mirrors allows you to use a huge, unlimited list of completely equally used mirrors; using multiple DNS pools leads to effects described under "CNAME hacks".
-
-These POCs should be 1:1 usable on the Tails [[download]] page. All that would be needed is setting up the DNS pools and/or named mirrors, and telling the mirror owners to configure their servers to respond to \*.amnesia.boum.org (the wildcard is important).
-
-### JavaScript POC (multiple DNS pools)
-
- <script src="//code.jquery.com/jquery.min.js"></script>
- <script type="text/javascript">//<![CDATA[
- $(window).load(function(){
- var hosts = Array("dl.amnesia.boum.org","dl2.amnesia.boum.org","dl3.amnesia.boum.org","dl4.amnesia.boum.org","dl5.amnesia.boum.org");
- var host = hosts[Math.floor(Math.random()*hosts.length)];
- $(document).ready(function() {
- var strNewString = $('body').html().replace(/dl\.amnesia\.boum\.org/g,host);
- $('body').html(strNewString);
- });
- });//]]>
- </script>
-
-For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.org. Just responding to one of the pool names would make this a very unflexible solution, so the wildcard is needed.
-
-At least nginx is unable to use a wildcard like dl\*.amnesia.boum.org, so \*.amnesia.boum.org has to be used. This is more flexible anyway.
-
-#### Example webpage (see the webpage source there too)
-
-<http://freiwuppertal.de/tails-mirror-example-dns.htm>
-
-
-### JavaScript POC (named mirrors)
-
- <script src="//code.jquery.com/jquery.min.js"></script>
- <script type="text/javascript">//<![CDATA[
- $(window).load(function(){
- var hosts = Array("freiwuppertal.dl.amnesia.boum.org","othermirror.dl.amnesia.boum.org","yetanother.dl.amnesia.boum.org","weirdname.dl.amnesia.boum.org","supermirror.dl.amnesia.boum.org");
- var host = hosts[Math.floor(Math.random()*hosts.length)];
- $(document).ready(function() {
- var strNewString = $('body').html().replace(/dl\.amnesia\.boum\.org/g,host);
- $('body').html(strNewString);
- });
- });//]]>
- </script>
-
-For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.org. Just responding to a fixed name would make this an unflexible solution, so the wildcard is needed.
-
-#### Example webpage (see the webpage source there too)
-
-<http://freiwuppertal.de/tails-mirror-example-named.htm>
-
-#### Giving mirrors higher or lower weight
-
-Using this approach, giving one mirror more weight than others is very easy: Simply add it's name multiple times to the array of mirrors. :D
-
-### Vanilla JavaScript POC and JSON
-
- <a href="http://dl.amnesia.boum.org/tails/stable/tails-i386-1.6/tails-i386-1.6.iso" id="dllink">download link</a>
-
- <script type="text/javascript">
- function fetchJSONdata(path, callback) {
- var xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (xhr.readyState === 4) {
- if (xhr.status === 200 || xhr.status === 0) {
- var data = JSON.parse(xhr.responseText);
- if (callback) callback(data);
- } else {
- console.log( "Error: " + xhr.statusText);
- }
- }
- };
- xhr.open('GET', path, true);
- xhr.send();
- }
-
- function getRandomInt(min, max) {
- return Math.floor(Math.random() * (max - min +1)) + min;
- }
-
- function isJSON(str) {
- try {
- JSON.parse(str);
- } catch (e) {
- return false;
- }
- return true;
- }
-
- function replaceDownloadURL(updatedURL) {
- var URLMarker = "/tails/stable";
- // todo check that url is a correct url
- var linkDOMElem = document.getElementById('dllink');
- var linkHREF = linkDOMElem.href.split( '//' );
- var linkToISO = linkHREF[1].split( URLMarker );
- // fixme http or https
- linkDOMElem.href = '//' + updatedURL + URLMarker + linkToISO[1];
- return true;
- }
-
- fetchJSONdata('./mirrors.json', function(data){
- //console.log(data);
- if( data == "undefined" ) {
- console.log( "Error: mirror data not loaded.");
- } else if( !isJSON( JSON.stringify(data) ) ) {
- console.log( "Error: mirror data is not JSON.");
- } else {
- //console.log(data.mirrors);
- // todo delete all mirrors with weight 0 before choosing one
- if(data.mirrors.length > 0 ) {
- var activeMirrors = new Array();
- for ( i = 0; i < data.mirrors.length; i++ ) {
- if ( data.mirrors[i].weight != 0 ) {
- // add mirror as many times as its weight, max weight is 5
- if ( parseInt(data.mirrors[i].weight ) > 5) {
- var max_weight = 5;
- } else {
- var max_weight = parseInt( data.mirrors[i].weight );
- }
- for ( w = 0; w < max_weight; w++ ) {
- activeMirrors.push( data.mirrors[i] );
- }
- }
- }
- console.log(activeMirrors);
-
- var randomMirror = getRandomInt(0, activeMirrors.length-1);
- //console.log(randomMirror);
- //console.log(data.mirrors[randomMirror]);
- replaceDownloadURL(activeMirrors[randomMirror].url);
- }
- }
- });
- </script>
-
-The mirrors.json file contains:
-<pre>
- {
- "mirrors": [
- { "url": "1.dl.amnesia.boum.org", "weight": "10" },
- { "url": "5.dl.amnesia.boum.org", "weight": "5" },
- { "url": "6.dl.amnesia.boum.org", "weight": "6" },
- { "url": "3.dl.amnesia.boum.org", "weight": "0" }
- ]
- }
-</pre>
-
-
-## PHP: first draft
-
-
- // http://stackoverflow.com/questions/4233407/get-random-item-from-array
-
- $mirrors = Array("alice.amnesia.boum.org","bob.amnesia.boum.org","clark.amnesia.boum.org","deborah.amnesia.boum.org","eric.amnesia.boum.org","freiwuppertal.amnesia.boum.org");
- $mirror = $mirrors[array_rand($mirrors)];
- echo "<p><a href=\"http://{$mirror}/tails/stable/tails-i386-1.4/tails-i386-1.4.iso\">Download Tails!</a></p>\n";
- echo "<p>Selected mirror: {$mirror}</p>";
-
-Try it here:
-http://sandbox.onlinephpfunctions.com/code/54ffcc18e5dbbafc6c7d3c81e0c26f94ce7946fc
-
-Note: I am a horrible coder and basically copied this from the linked StackOverflow page. This page also helped me: http://php.net/manual/de/function.echo.php
-...and that's all. There might be security flaws in this extremely simple concept, so please have a close look at it. :)
+See [[HTTP_mirror_pool/archive]].
diff --git a/wiki/src/blueprint/HTTP_mirror_pool/archive.mdwn b/wiki/src/blueprint/HTTP_mirror_pool/archive.mdwn
new file mode 100644
index 0000000..a6afc79
--- /dev/null
+++ b/wiki/src/blueprint/HTTP_mirror_pool/archive.mdwn
@@ -0,0 +1,308 @@
+[[!toc levels=2]]
+
+The idea I had was to let the server(s) send a reduced list of hosts. Not
+only it would allow to work-around Tor DNS limitations, but also to have
+some weighted round robin, in order to prioritize some high bandwidth
+mirrors, if we choose to.
+
+If I had to mention the ideal design goals for such changes, I would say
+that the more straightforward would be the better for implementation and
+also for maintainability.
+
+## Using DNS
+
+Using DNS seems to be an easy way to do some round robin in low level. It
+allows some kind of transparency to the upper layers protocols and
+distribute the load and to avoid having a single server that can became a
+SPOF.
+
+The following ways are available to implement it:
+
+* CNAME Hacks
+* NS Hacks
+* Modified DNS servers
+
+### CNAME Hacks
+
+As mention by ToBeFree something that can be done is to have different
+pools of servers like:
+
+ a.dl.amnesia.boum.org A $MIRROR1
+ a.dl.amnesia.boum.org A $MIRROR2
+ a.dl.amnesia.boum.org A $MIRROR3
+ a.dl.amnesia.boum.org A $MIRROR4
+ a.dl.amnesia.boum.org A $MIRROR5
+
+ b.dl.amnesia.boum.org A $MIRROR6
+ b.dl.amnesia.boum.org A $MIRROR7
+
+ dl.amnedia.boum.org CNAME a.dl.amnesia.boum.org
+ dl.amnedia.boum.org CNAME b.dl.amnesia.boum.org
+
+Interestingly the requests would be equally distributed betwen a.dl and
+b.dl, thus if their is more mirrors in one name than one other some
+servers would be somehow prioritized. For example: here "a" mirrors will
+share 50% of requests, giving 10% for every host where "b" mirrors will
+share the other 50% of requests betwen two host giving them 25% of
+requests each.
+
+However this kind of CNAME hack is not supported by current DNS
+Servers. Bind 8 used to support it with a [configuration
+option](http://docstore.mik.ua/orelly/networking_2ndEd/dns/ch10_07.htm)
+that has not been ported to bind 9. Neither NSD nor PowerDNS seem to
+support it, and their is no actual data about how resolvers would
+handle this case, so I don't think it is the best option.
+
+### NS Hacks
+
+Following the same idea the dl amnesia.boum.org could be delegated to a
+few different DNS servers, and those servers may have different versions
+of the zone. For example:
+
+ dl.amnesia.boum.org NS $DNS1
+ dl.amnesia.boum.org NS $DNS2
+
+DNS1 would have a zone similar to a.dl.amnesia.boum.org:
+
+ dl.amnesia.boum.org A $MIRROR1
+ dl.amnesia.boum.org A $MIRROR2
+ dl.amnesia.boum.org A $MIRROR3
+ dl.amnesia.boum.org A $MIRROR4
+ dl.amnesia.boum.org A $MIRROR5
+
+And DNS2 would have a zone similar to b.dl.amnesia.boum.org:
+
+ dl.amnesia.boum.org A $MIRROR6
+ dl.amnesia.boum.org A $MIRROR7
+
+In theory it should work (and give almost the same load distribution as
+CNAME hacks, almost as the NS servers will not receive 50% of requests
+because of [[!rfc 5452]]). However, I am not sure that playing with DNS
+inconsistency will be a so good idea, for example for maintainability :)
+
+### Using modified DNS servers
+
+Interestingly Tails is not the first project to be looking how to use DNS
+for load distribution. People already wrote some DNS software designed to
+handle those usecases and return the visitor a reduced list of servers
+according to some rules like weights or geolocalisation. They work by
+delegating a subzone (like dl.amnesia.boum.org) to those servers and with
+zone files containing additionals fields. There is two main softwares for
+those usecases:
+
+* <http://gdnsd.org/> which is available on debian and used for
+ example for wikipedia.
+
+* <https://github.com/abh/geodns> that requires manual installation
+ and is used for example by pool.ntp.org.
+
+Deploying such software would solve the problem in a more elegant way than
+CNAME or NS hacks. It would require a bit of system administration that
+maybe can be done using some puppet templates in a few Virtal Machines.
+
+## Using HTTP(s)
+
+DNS is not the only way to do some load balancing. It is mostly used for
+low level protocols that don't allow redirects (for example: NTP). As
+content download is already done using HTTP(s). HTTP(s) can be leveraged
+to do this kind of load balancing. It is what is done by sourceforge.net
+as pointed by ToBeFree and by many Linux distributions.
+
+For example using a PHP script (or more complete options such as
+mirrorbrain, thanks Sagi!) that would redirect requests to
+`dl.amnesia.boum.org/$file to $mirror.dl.amnesia.boum.org/$file`
+randomly or according to some additional rules (weights,
+geolocalisation, SSL availability ...).
+
+There is a few drawbacks on this approach:
+
+* It would increase a bit the load on boum.org's server.
+* It would increase the dependency on this server, meaning that it is
+ unavailable (down, blocked...), downloads will be blocked (but in this
+ case the site will be too).
+* It would require to develop the script or to install one such as
+ mirrorbrain (which is feature-full, available as [3rd party Debian
+ packages](http://download.opensuse.org/repositories/Apache:/MirrorBrain/),
+ and requires PostgreSQL).
+
+On the other side it has a few advantage:
+
+* It will only require a few ~20 lines of PHP script when DNS based
+ solutions require to install and maintain additional software and servers.
+* It can allow the script to be personnalised to add some additional rules
+ if necessary.
+* As boum.org server will see every requests, it would allow to do some
+ stats.
+* It can allow to use $mirror.dl.amnesia.boum.org URLs, allowing to deploy
+ SSL certificates easier that if all mirrors use dl.amnesia.boum.org.
+* As ToBeFree mentionned (thanks!) it is also possible to use some client
+ side scripts to select the mirror. I would not recommend to rely only on
+ this option as it would not work for browsers without scripts, but it can
+ be done as a complementary approach, it order to reduce the load and
+ dependency to dl.amnesia.boum.org's server.
+
+Thus, if I may, I would like to recommend considering the HTTP(s) option,
+even if it means that I have to write the PHP script by myself or to create
+an easy task entry on the ticket tracker and follow it :)
+
+## Proof of concept: JavaScript + multiple DNS pools / named mirrors
+
+This method can either be used with multiple DNS pools (dl1.amnesia.boum.org, dl2.amnesia.boum.org etc.) or with named mirrors (freiwuppertal.dl.amnesia.boum.org, othermirror.dl.amnesia.boum.org, ...). Using named mirrors allows you to use a huge, unlimited list of completely equally used mirrors; using multiple DNS pools leads to effects described under "CNAME hacks".
+
+These POCs should be 1:1 usable on the Tails [[download]] page. All that would be needed is setting up the DNS pools and/or named mirrors, and telling the mirror owners to configure their servers to respond to \*.amnesia.boum.org (the wildcard is important).
+
+### JavaScript POC (multiple DNS pools)
+
+ <script src="//code.jquery.com/jquery.min.js"></script>
+ <script type="text/javascript">//<![CDATA[
+ $(window).load(function(){
+ var hosts = Array("dl.amnesia.boum.org","dl2.amnesia.boum.org","dl3.amnesia.boum.org","dl4.amnesia.boum.org","dl5.amnesia.boum.org");
+ var host = hosts[Math.floor(Math.random()*hosts.length)];
+ $(document).ready(function() {
+ var strNewString = $('body').html().replace(/dl\.amnesia\.boum\.org/g,host);
+ $('body').html(strNewString);
+ });
+ });//]]>
+ </script>
+
+For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.org. Just responding to one of the pool names would make this a very unflexible solution, so the wildcard is needed.
+
+At least nginx is unable to use a wildcard like dl\*.amnesia.boum.org, so \*.amnesia.boum.org has to be used. This is more flexible anyway.
+
+#### Example webpage (see the webpage source there too)
+
+<http://freiwuppertal.de/tails-mirror-example-dns.htm>
+
+
+### JavaScript POC (named mirrors)
+
+ <script src="//code.jquery.com/jquery.min.js"></script>
+ <script type="text/javascript">//<![CDATA[
+ $(window).load(function(){
+ var hosts = Array("freiwuppertal.dl.amnesia.boum.org","othermirror.dl.amnesia.boum.org","yetanother.dl.amnesia.boum.org","weirdname.dl.amnesia.boum.org","supermirror.dl.amnesia.boum.org");
+ var host = hosts[Math.floor(Math.random()*hosts.length)];
+ $(document).ready(function() {
+ var strNewString = $('body').html().replace(/dl\.amnesia\.boum\.org/g,host);
+ $('body').html(strNewString);
+ });
+ });//]]>
+ </script>
+
+For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.org. Just responding to a fixed name would make this an unflexible solution, so the wildcard is needed.
+
+#### Example webpage (see the webpage source there too)
+
+<http://freiwuppertal.de/tails-mirror-example-named.htm>
+
+#### Giving mirrors higher or lower weight
+
+Using this approach, giving one mirror more weight than others is very easy: Simply add it's name multiple times to the array of mirrors. :D
+
+### Vanilla JavaScript POC and JSON
+
+ <a href="http://dl.amnesia.boum.org/tails/stable/tails-i386-1.6/tails-i386-1.6.iso" id="dllink">download link</a>
+
+ <script type="text/javascript">
+ function fetchJSONdata(path, callback) {
+ var xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState === 4) {
+ if (xhr.status === 200 || xhr.status === 0) {
+ var data = JSON.parse(xhr.responseText);
+ if (callback) callback(data);
+ } else {
+ console.log( "Error: " + xhr.statusText);
+ }
+ }
+ };
+ xhr.open('GET', path, true);
+ xhr.send();
+ }
+
+ function getRandomInt(min, max) {
+ return Math.floor(Math.random() * (max - min +1)) + min;
+ }
+
+ function isJSON(str) {
+ try {
+ JSON.parse(str);
+ } catch (e) {
+ return false;
+ }
+ return true;
+ }
+
+ function replaceDownloadURL(updatedURL) {
+ var URLMarker = "/tails/stable";
+ // todo check that url is a correct url
+ var linkDOMElem = document.getElementById('dllink');
+ var linkHREF = linkDOMElem.href.split( '//' );
+ var linkToISO = linkHREF[1].split( URLMarker );
+ // fixme http or https
+ linkDOMElem.href = '//' + updatedURL + URLMarker + linkToISO[1];
+ return true;
+ }
+
+ fetchJSONdata('./mirrors.json', function(data){
+ //console.log(data);
+ if( data == "undefined" ) {
+ console.log( "Error: mirror data not loaded.");
+ } else if( !isJSON( JSON.stringify(data) ) ) {
+ console.log( "Error: mirror data is not JSON.");
+ } else {
+ //console.log(data.mirrors);
+ // todo delete all mirrors with weight 0 before choosing one
+ if(data.mirrors.length > 0 ) {
+ var activeMirrors = new Array();
+ for ( i = 0; i < data.mirrors.length; i++ ) {
+ if ( data.mirrors[i].weight != 0 ) {
+ // add mirror as many times as its weight, max weight is 5
+ if ( parseInt(data.mirrors[i].weight ) > 5) {
+ var max_weight = 5;
+ } else {
+ var max_weight = parseInt( data.mirrors[i].weight );
+ }
+ for ( w = 0; w < max_weight; w++ ) {
+ activeMirrors.push( data.mirrors[i] );
+ }
+ }
+ }
+ console.log(activeMirrors);
+
+ var randomMirror = getRandomInt(0, activeMirrors.length-1);
+ //console.log(randomMirror);
+ //console.log(data.mirrors[randomMirror]);
+ replaceDownloadURL(activeMirrors[randomMirror].url);
+ }
+ }
+ });
+ </script>
+
+The mirrors.json file contains:
+<pre>
+ {
+ "mirrors": [
+ { "url": "1.dl.amnesia.boum.org", "weight": "10" },
+ { "url": "5.dl.amnesia.boum.org", "weight": "5" },
+ { "url": "6.dl.amnesia.boum.org", "weight": "6" },
+ { "url": "3.dl.amnesia.boum.org", "weight": "0" }
+ ]
+ }
+</pre>
+
+
+## PHP: first draft
+
+
+ // http://stackoverflow.com/questions/4233407/get-random-item-from-array
+
+ $mirrors = Array("alice.amnesia.boum.org","bob.amnesia.boum.org","clark.amnesia.boum.org","deborah.amnesia.boum.org","eric.amnesia.boum.org","freiwuppertal.amnesia.boum.org");
+ $mirror = $mirrors[array_rand($mirrors)];
+ echo "<p><a href=\"http://{$mirror}/tails/stable/tails-i386-1.4/tails-i386-1.4.iso\">Download Tails!</a></p>\n";
+ echo "<p>Selected mirror: {$mirror}</p>";
+
+Try it here:
+http://sandbox.onlinephpfunctions.com/code/54ffcc18e5dbbafc6c7d3c81e0c26f94ce7946fc
+
+Note: I am a horrible coder and basically copied this from the linked StackOverflow page. This page also helped me: http://php.net/manual/de/function.echo.php
+...and that's all. There might be security flaws in this extremely simple concept, so please have a close look at it. :)
diff --git a/wiki/src/blueprint/Linux_containers.mdwn b/wiki/src/blueprint/Linux_containers.mdwn
index e961ad9..73913ce 100644
--- a/wiki/src/blueprint/Linux_containers.mdwn
+++ b/wiki/src/blueprint/Linux_containers.mdwn
@@ -111,6 +111,7 @@ Running GUI applications in containers
* [GNOME sandboxed
applications](https://wiki.gnome.org/Projects/SandboxedApps), aka.
`xdg-app`; their concept of "portals" is very interesting.
+ - [GNOME Developer Experience hackfest: xdg-app + Debian](http://smcv.pseudorandom.co.uk/2016/xdg-app/)
* <http://pleonasm.info/blog/2012/10/privilege-separation-with-xpra/>
* [docker-desktop](https://github.com/rogaha/docker-desktop)
* Stéphane Graber's [LXC 1.0 blog post
diff --git a/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn b/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
index a018dcc..22ed957 100644
--- a/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
+++ b/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
@@ -1,3 +1,130 @@
+[[!toc levels=1]]
+
+# Linux dependencies
+
+The current Tails Installer version (<https://git-tails.immerda.ch/liveusb-creator/>)
+has considerable changes when compared with the upstream Fedora liveusb-creator
+(<https://git.fedorahosted.org/cgit/liveusb-creator.git>).
+
+The current package dependencies for the Tails Installer in Linux are:
+
+* dosfstools
+* gdisk
+* genisoimage
+* gir1.2-glib-2.0
+* gir1.2-gtk-3.0
+* gir1.2-udisks-2.0
+* mtools
+* p7zip-full
+* policykit-1
+* python-configobj
+* python-gi
+* python-urlgrabber
+* syslinux
+
+If we list the set of requirements for each important source file then we have:
+
+### \_\_init\_\_.py
+
+ import gettext
+
+ if sys.platform == 'win32':
+ import gettext_windows
+ gettext_windows.setup_env()
+
+### creator.py
+
+ if 'linux' in sys.platform:
+ import gi
+ gi.require_version('UDisks', '2.0')
+ from gi.repository import UDisks, GLib
+
+ Commands:
+ * syslinux
+ * sgdisk
+ * dd
+ * dosfslabel
+ * e2label
+ * extlinux
+ * pkexec
+ * mkdiskimage
+ * sync
+
+### gui.py
+
+ from gi.repository import Gdk, GLib, Gtk
+ urlgrabber
+
+ In general GTK3
+
+### launcher.py
+
+ from gi.repository import Gtk
+
+### utils.py
+
+ if 'linux' in sys.platform:
+ from gi.repository import GLib
+
+# Alternatives for Windows:
+
+The Windows specific code for the Tails Installer uses mostly
+the Python win32 interfaces:
+
+ import win32file, win32api, pywintypes
+
+and a set of third parties tools listed here:
+
+<https://git-tails.immerda.ch/liveusb-creator/tree/tools>
+
+There are other tools that would be possible to explore like:
+<https://labs.riseup.net/code/issues/10984>
+
+As a conclusion, the biggest difference in the current Tails version is the usage
+of the Python interface for GTK3 (PyGI). The tools/libraries for Windows used in
+the current upstream liveusb-creator version seem in principle like the same
+used for Tails right now, except for the GUI parts.
+
+# Analysis regarding operations on storage devices
+
+According to <https://tails.boum.org/contribute/design/installation/>,
+the steps to create a Tails bootable device are:
+
+1. Partition the device as a GPT partition.
+2. Create a FAT32 (VFAT) partition with the Tails files and Tails label.
+3. (Optionally) Create a persistence partition with LUKS.
+
+When we analyze the current Tails Installer code related to the former
+steps:
+
+## GPT partition.
+
+### creator.py
+ def partition_device():
+
+ The Linux code uses UDISK instead of plain sgdisk, because the first allows unprivileged users
+ to get a refreshed partition table from the kernel. The Windows code doesn't implement
+ this, but the usage of sgdisks is suggested <http://www.rodsbooks.com/gdisk/>.
+
+## FAT32 (VFAT) partition:
+
+### creator.py
+
+ def format_device(self):
+
+ The Linux code uses UDISK as well. For Windows the "format" command is used,
+ but it looks outdated:
+
+ def format_device(self):
+ """ Format the selected partition as FAT32 """
+ self.log.info('Formatting %s as FAT32' % self.drive['device'])
+ self.popen('format /Q /X /y /V:Fedora /FS:FAT32 %s' % self.drive['device'])
+
+## Persistent partition:
+
+This is managed by the persistence-setup <https://git-tails.immerda.ch/persistence-setup>
+so it is beyond the scope of the current research.
+
# PyGI windows executable
I managed to create a native windows executable for a test Python/GI program under Windows 8.1
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
deleted file mode 100644
index 1696182..0000000
--- a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta title="Tails January 2016 report"]]
-
-[[!toc levels=2]]
-
-<div class="caution">
-<strong>Deadline: 2016-02-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 January 2016.
-
-Everything in this report can be made 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
-
-## A.1.1 Secure the Icedove autoconfig wizard
-
- We've been evaluating our own patches for Icedove against those
- reported to Mozilla's bugtracker and are happy to announce that our
- patches would provide an option to accept only secure protocols, as
- a user opt-in. These patches will be submitted to Mozilla's bugtracker
- and hopefully integrated upstream.
- ([[!tails_ticket 7064]])
-
-## A.1.2 Make our improvements maintainable for future versions of Icedove
-
- Unfortunately we also discovered that the autoconfig wizard of Icedove does
- not always use the configured proxy. This means, that some traffic can leak.
- This is not a security problem in Tails since we drop non-Tor
- traffic by default, but for this very reason in breaks the
- functionality of the autoconfig wizard in the context of Tails.
- We started to write a proof-of-concept patch to fix this bug.
-
-# B. Improve our quality assurance process
-
-
-# C. Scale our infrastructure
-
-
-# D. Migration to Debian Jessie
-
-
-# E. Release management
diff --git a/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn b/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn
deleted file mode 100644
index 26ed5ef..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to the tails-greeter GSoC'2011 project's blog!
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn b/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn
deleted file mode 100644
index 3f003c2..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-### Update:
-
-Build takes ages, spits several errors like:
-
-"ERROR: ld.so: object '/usr/lib/libeatmydata/libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored"
-
-but successfully produce .iso
-
-#### Current status:
-back on track.
-
-#### Near-future plans:
-whine until I have access to build-server more powerful than my ancient laptop :-)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn
deleted file mode 100644
index 620179c..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta date="Mon May 9 02:02:02 2011"]]
-
-This is the 1st in a series of bi-weekly reports which will follow alongside the implementation of tails-greeter project.
-
-#### Current progress:
-
-- created design document as subpage for TailsGreeter on wiki
-- tried building tails iso
-
-#### Problems:
-
-- build fails with various problems on different machines
-- build requires root privileges (upstream problem with live-build, see http://live.debian.net/devel/live-build/todo/ entries for "core")
-
-#### Near-future plans:
-
-- investigate and fix abovementioned problems
-- read on .deb packaging
-- read on vala (development environment setup and code samples)
-
-#### Additional notes:
-
-This entry will serve as a small test for unicode support of ikiwiki as well - see the numbering in heading :)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn
deleted file mode 100644
index 8028822..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-[[!meta date="Fri Jul 29 02:02:02 2011"]]
-
-## Current progress:
-
-- verify that locale is correctly applied to gnome-session and fix if it isn't - DONE.
-- fix layout widget loading - DONE.
-- obtain list of kb layouts and variants available (via python-xklavier) - postponed.
-- populate layout widget with kb variants - postponed.
-- apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session) - postponed.
-- verify that layout switching works after login - postponed.
-- Add option to skip all the greeter screens and immediately login with default settings - DONE.
-- Convey necessary env. variables to gnome session.(echo "VARIABLE=value" >> /etc/amnesia/environment or via /etc/gdm3/PostLogin/)
-- capitalize 1st letter of (latin) language names (e. g. English vs english) - DONE.
-- version tag and update - DONE.
-
-
-## Problems:
-
-- ISP failure which caused lack of regular updates and report delay
-- it's impossible to set env. vars via /etc/gdm3/PostLogin/ - it's writable by root only and greeter is running as 'gdm-user' account
-- python-xklavier bindings are incomplete: the most needed function "search_by_pattern" is unavailable.
-
-
-## Near-future plans:
-
-- find a way to overcome python-xklavier limitations
-- Next week plans.
-
-## Additional notes:
-
-- Right now layout widget is dummmy: only "next" button is working.
-- The language choice is applied to session semi-correctly: if there are several country locales correspond to one language (for examle French is Belgium, France etc) than one of them is picked seemingly random. Once there is workaround for xklavier issue than it'll be user choice made based on layout widget.
-
-
-
-
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn
deleted file mode 100644
index 9e72411..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-[[!meta date="Fri Aug 5 02:02:02 2011"]]
-
-## Current progress:
-
-- obtain list of kb layouts and variants available (via python-xklavier) - DONE.
-- populate layout widget with kb variants - DONE.
-- merge feature/better_root_access_control branch - DONE.
-- apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session) - postponed.
-- verify that layout switching works after login - postponed
-- version tag and update - DONE.
-
-## Problems:
-
-- tails-greeter is run under gdm's account but altering gdm PostLogon files (to set env variables) or locale compilation via localedef require root privileges.
-- xklavier set and check layout without errors but it doesn't affect greeter nor following session.
-- better_root_access_control feature requires env. variable to be set which is not possible yet.
-
-## Near-future plans:
-
-- wait for answer from gdm and xklavier devs to figure out workarounds for current problems
-- replace 2 widgets with 1 panel with same functionality
-- test the result with tails
-
-## Additional notes:
-
-- right now there are 2 "screens" which user moves through by pressing "next" button. That's rather ugly and is planned to be replaced with one of the following:
-
-
-1) single "screen" with requests for both at the same time
-
-2) 2 "screens" with language and layout requests on first one and admin password request on second one
-
-- Which do you think is better and why?
-- Please feel free to discuss it on irc this Saturday during regular meeting time or whenever you'll see max-gsoc
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn
deleted file mode 100644
index e2a7066..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-## Current progress:
-
-0. write password for config/chroot_local-includes/usr/local/sbin/set-user-password
-to file - DONE.
-0. alter set-user-password to use password from file - DONE.
-0. merge language and layout widget to single panel - DONE.
-0. write locale name for localedef to file - DONE.
-0. add locale generator which uses data from file - DONE.
-0. fix layout selection for greeter session - DONE.
-0. add double password entry to prevent typos - DONE.
-0. use SelectLayout in GDM - DONE.
-0. add layout selection to panel - DONE.
-0. use separate layouts for greeter and for user session - DONE.
-0. display panel and password widget on the same screen - DONE.
-0. add layout indicator to greeter - DONE.
-0. properly generate list of available layouts - in progress
-0. version tag and update - DONE.
-
-
-## Problems:
-
-Generation of layout list based on language or locale is incomplete - it works only
-for some well-tested cases (e. g. Русский). More testing required for other languages
-and general code refactoring needed as well.
-
-## Near-future plans:
-
-0. Finish layout generation code.
-0. Update documentation.
-0. Other plans from timeline.
-
-## Additional notes:
-
-Please test how it works for YOUR favorite language.
-The GSoC is almost over - next week is the time for final wrap-ups.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn
deleted file mode 100644
index 639d09a..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-## Current progress
-
-0. refactor layout generation code - DONE.
-0. disable admin rights for empty password - DONE.
-0. add layout variant selection - DONE.
-0. use selected variant for greeter and session layout - DONE.
-0. add variant to layout indicator - DONE.
-0. make session layout selection enforce greeter layout selection - DONE.
-0. make session layout variant selection enforce greeter layout variant selection - DONE.
-0. make sure panel width fits the screen - DONE.
-0. pre-select locale based on language - DONE.
-0. correct UI phrasing - DONE.
-0. show country name instead of code (e. g. Russia vs. ru_RU) - DONE.
-0. update translation instructions - DONE.
-0. add ability to use any layout regardless of language\locale choice - postponed
-0. fix entry field width - postponed
-0. fix polkit & sudo configuration - testing required
-0. test with TAILS VM - in progress
-0. document latest design changes - in progress
-0. version tag and update - DONE.
-
-## Problems
-
-0. Glade seems pretty counter-intuitive: it's unclear how to make gtk window (parent) auto-resize when it's content (gtk entry inside gtk table) have expanded.
-0. Proposed addition to add selection of any layout will require list which is even bigger than language list (which is currently considered unusable due to its size) - it's unclear how to do it right in UI. Addition is justified by following use-case example: Italian speaking person running TAILS on computer with Norwegian kb layout and would like to have Italian locale but Norwegian layout to match hardware at hands.
-0. Hardcoded username and password prevent using tails-greeter 2nd time. Switch to gdm's autologin functionality is required.
-
-## Next week plans
-
-0. Document all the known issues. Create pages according to bug-reporting guideline.
-0. Try to fix some of them.
-0. Consume questionable substances - celebrate GSoC completion.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn
deleted file mode 100644
index d9ceeee..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta date="Mon May 23 02:02:02 2011"]]
-
-## Current progress
-
-- git repositories ready (or, frankly, I feel ready to use them :)
-- tried debian packaging and it seems to work ("seems" because it's readily available packages, not my own code yet)
-- found example dbus implementation of greeter interface in python:
-<http://doctormo.org/2011/04/12/how-to-make-a-gnome-login-screen-in-python/>
-- walked through vala code samples for dbus & GUI
-
-## Problems
-
-- university workload increased, will post corresponding changes to schedule soon
-- GDM's interfaces are not so well documented
-
-## Near-future plans
-
-- official coding start
-- pick build system (scons? cmake? autotools?), in a mean time will use plain old makefile
-- iron-out workflow (code, test, commit, build, report sequence)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn
deleted file mode 100644
index f722e95..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta date="Fri Jun 3 02:02:02 2011"]]
-
-## Current progress
-
-- project language switch vala -> python
-- main reason: working example made in python dy doctormo
-- big repo update: with 'upstream' branch for doctormo's code and 'master' branch for actual development
-
-## Problems
-
-- scm conversion with 'taylor' failed so dumb import of entire bzr tree is performed
-- university workload spike started earlier than anticipated
-
-## Near-future plans
-
-- mange university workload
-- make .deb for doctormo's code
-- integrate .deb building with git
-
-## Note:
-
-Next week will be mostly dedicated to exam, presentation and other university activities - hence tiny plans for it.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn
deleted file mode 100644
index e7537cb..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta date="Mon Jun 13 02:02:02 2011"]]
-
-## Current progress
-
-- mostly work on university projects so minor fixes and updates only
-- weekly meeting follow-up - multiple wiki updates
-- review existing python code & glade interfaces
-- gdm-community-greeter forked into tails-greeter
-- filed RFP for gtkme [[http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629199]] - dependency for tails-greeter
-- pbuilder fix: git-buildpackage successfully builds from 'master' granch
-- run community-greeter in VM: partially done - see below
-
-## Problems
-
-- installation into debian-squeeze is fine but got runtime error due to old python-gobject package, no backports found so .deb changed to prevent installation with unsopported version
-- check with debian-sid - installation is fine after dependency correction for gir1.0-gtk-2.0 -> gir1.2-gtk-2.0 but autostart failed for unknown reason
-
-## Near-future plans
-
-- complete VM testing
-- play with d-feet dbus debugger
-- alter python code with dummy 'admin password requestor'
-- check if current localization handling is suitable for tails-greeter
-- make plans for next week
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn
deleted file mode 100644
index a9c839b..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta date="Mon Jun 20 02:02:02 2011"]]
-
-## Current progress
-
-- convert tails-greeter to old-style pygtk to remove pygi dependecy: [in progress]
-- re-test converted version with squeeze: [done, test failed]
-- check if current localization handling is suitable for tails-greeter: [postponed]
-- make plans for next week: [done]
-
-## Problems
-
-- proper procedure for version increase
-- errors with dbus after conversion: access-denied on dbus call
-- dpkg-divert required for proper testing
-- need easy way to run python syntax quick check on entire file
-
-## Near-future plans
-
-- add dpkg-divert functionality to .deb
-- fix errors found after conversion
-- run external (placeholder) program with adequate parameters on language change (locale generation for example)
-- alter python code with dummy 'admin password requestor'
-- add tails-greeter.deb into tails.git (main) repo
-- add note that it's dangerous to install tails-greeter.deb :)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn
deleted file mode 100644
index 8e1fc68..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!meta date="Fri Jun 24 02:02:02 2011"]]
-
-## Current progress
-
-
-0. fix errors reported by pylint - DONE (some errors still there).
-0. bump version properly (git push --tags; git-dch --git-author) - DONE.
-0. add pylint conf to ignore dbus-related false positives - DONE (might hide real errors too).
-0. fix language selector so it's shown and work properly - DONE (.po translations are incomplete).
-0. check if current localization handling is suitable for tails-greeter - DONE (seems ok if locales are known at the time of package build).
-0. run external (placeholder) program with adequate parameters on language change (locale generation for example) - POSTPONED.
-0. wiki updates (testing instructions and overall status) - DONE.
-0. lintian tails-greeter.deb (using .changes file too) - DONE (no errors reported).
-0. make login possible - IN_PROGRESS.
-0. add .deb into tails repo - BLOCKED by previous item.
-0. make .iso build (if packages testing-ready) - BLOCKED by previous item.
-
-## Problems
-
-BeginAutoLogin works as expected but interfacing with existing GdmGreeter to send it at the right moment seems trick.
-Documentation complete absent so will have to talk directly with the developer about it.
-
-## Near-future plans
-
-0. relocation to another country
-0. fixes\updates\minor items which were postponed for whatever reason
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn
deleted file mode 100644
index 456839e..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta date="Tue Jun 28 02:02:02 2011"]]
-
-## Current progress
-
-0. change widget to fit many more languages: from flag icons to scrollable list - partially done (dummy widget only, no python code yet).
-0. make .iso build - not done.
-0. specify dbus interface to interact with external locale-gen script - not done (see 'Problems' below).
-0. change widget exec order (parallel->sequential) to comply with "localization notes" part of [[todo/TailsGreeter/design]] - not done (see 'Problems' below).
-
-## Problems
-
-0. relocation to another country.
-0. .iso build fails due to problems with underlying fs, fix testing is in progress.
-0. the widget exec order is hardcoded into community-greeter.py so this change requires more time than it was anticipated during previous planning.
-0. interaction with locale-gen script require rewrite of the d-bus code in services.py which cannot be completed during this week as well.
-
-## Near-future plans
-
-0. rewrite d-bus handling in service.py
-0. change widget exec order (rewrite community-greeter.py)
-0. substitute LanguageWindow widget with LangselectWindow
-0. setup squid-deb-proxy to speed-up live-build
-0. remainder of week #6 plans from [[todo/TailsGreeter/timeline]]
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn
deleted file mode 100644
index 6664e75..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Fri Jul 8 02:02:02 2011"]]
-
-## Current progress
-
-0. [Mon.] change widget exec order (parallel->sequential) to comply with "localization notes" part of [[todo/TailsGreeter/design]] - DONE.
-0. [Mon.] setup squid-deb-proxy - DONE.
-0. [Mon.] make .iso build - DONE.
-0. [Tue.] change widget to fit many more languages: from flag icons to scrollable list - DONE.
-0. [Wed.] (re)generate .po with (dummy) translations (to show that language change is actually working) - DONE.
-0. [Wed.] populate the list of supported languages in the widget from gnome-desktop-data package languages or dpkg-reconfigure locales (see gdm_get_all_language_names function for example) - DONE (with external helper script).
-0. [Thu.] 'subprocess': run external (locale-gen) program with adequate parameters on language change and wait for its completion before allowing logon - in progress.
-0. update tails-greeter.deb package - in progress.
-0. propose rough plans / estimates for all the remaining weeks - postponed.
-
-## Problems
-
-0. Current implementation uses gtk's ComboBox for the list of languages. Switching to scrollable list (similar to debian-installer) might require to scale better to bigger number of languages but it will take a bit more efforts to integrate it with gtkme wrapper.
-0. Pygtk functions for window.show() and window.hide() do not work as expected - sometimes window which supposed to be hidden remain visible despite successful gtk property change. Right now the workaround is to call window.destroy() however this might not scale that well if we will have multiple windows with complex interactions in between in future. To summarize: worth investigating but not top priority at the moment.
-0. Right now language list is presented to user based on the locales available in the system (e. g. those chosen via 'dpkg-reconfigure locales' for example). Those might be unsupported by available tails-greeter translations. And vice-versa: there might be tails-greeter translation which doesn't correspond to any system locale. Those situations got to be carefully tested and handled gracefully.
-0. Current implementation uses subprocess' calls to run locale generation from autologin widget - it should be moved to upper layer - to the greeter itself: it will be easier to incorporate other widgets this way.
-0. There are several ways to obtain list of supported locales in gdm/gui/simple-greeter/gdm-languages.c (including locale.alias file, gdm's locale-archive and system-wide locale-archive). Similar logic should be incorporated into tails-greeter. It's worth investigating if it's feasible to engage gdm code using ctypes for example.
-
-## Near-future plans
-
-0. Complete .iso build and tests, push new tails-greeter.deb if the tests are successful.
-0. Investigate things listed in 'problems' section above
-0. Implement plans for next week #7
-
-## Additional notes
-
-0. Right now language choice is applied only after user have pressed 'forward' button - it would look nicer if it's done immediately upon selection.
-0. Language list should contain language's own name (e. g. 'Русский' for 'Russian') instead of current 2-letter code.
-
-Those should be included into plans for some of the upcoming weeks.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn
deleted file mode 100644
index d2a194c..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Fri Jul 15 02:02:02 2011"]]
-
-## Current progress
-
-
-0. populate language list using list of available locales in /usr/share/i18n/SUPPORTED - DONE.
-0. supply parameter as 'en' (or smth else suitable for locale generation - investigate) to locale-gen - DONE.
-0. Language list should contain language's own name (e. g. 'Русский' for 'Russian')
-instead of current 2-letter code - DONE.
-0. translate language widget too (move lang choice handler from button_clicked to list_choice)
-0. Move locale-gen interaction to greeter from widget - DONE.
-0. cleanup commented\old\dead code - DONE.
-0. obtain list of kb layouts available (via python-xklavier)
-0. use existing code/UI from d-i/anaconda/ubuntu installer/ for language chooser if possible - partially done (PyICU utilized).
-0. apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session)
-
-## Problems
-
-0. Some of the 'native' language names are not displayed correctly due to missing characters in the fonts (standard unicode squares shown instead). It's unclear how to filter them out because there are no actual errors shown in python.
-0. The language list is fairly long: maybe some of the exotic languages could be filtered or black-listed before list population?
-0. It's yet unclear how to pass information to the session initiated by gdm: especially how to set env. variable and apply language & layout settings - probably there are some dbus hooks available.
-0. xklavier and ICU seems like the right way to work with language and layout data but there is no obvious way to reuse code from installers (anaconda, d-i) directly.
-
-## Near-future plans
-
-0. Make widget for layout choice and populate it with data obtained via xklavier.
-0. Create version suitable for .iso build and test.
-0. Next week plans.
-
-## Additional notes
-
-0. Part of the code has been merged back to gdm-community-greeter project via special branch.
-0. The issue with wrongly displayed language names might be related to legacy (non-utf8) encodings. Right now there is no special treatment for those encodings. It's unclear whether some support required in tails-greeter for that at all.
-0. The general 'id' for the locale looks like ru_RU (language-country code) - see 'man localedef'. What's the acceptable id for layout is still unclear.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn
deleted file mode 100644
index 7064fd4..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Wed Jul 20 02:02:02 2011"]]
-
-## Current progress
-
-0. document interface to locale-gen - DONE.
-0. make sure it's possible to choose language multiple times before 'forward' button pressed - DONE.
-0. apply chosen language to gnome session - needs testing
-0. borrow ubiquity widgets for keyboard layout if possible - DONE.
-0. create keyboard layout widget - in progress.
-0. update requestor widget to hide password while typing - DONE.
-0. [Convert packages to dh_python2](http://wiki.debian.org/Python/TransitionToDHPython2) because python-support is deprecated - merge dh_python2 branch - DONE.
-0. pressing 'enter' in password request widget should be equal to button click - DONE.
-0. version tag and update - DONE.
-
-## Problems
-
-0. What's the best way to check that chosen language was actually applied to gnome session in Debian? 1) dpkg-reconfigure locales 2) choose supported locale 3) ??? are there some packages got to be installed? some env vars set? what should change as a result of proper language choice?
-In short - test-case description is missing.
-0. Layout widget borrowed from ubiquity fails with error:
-AttributeError: 'gtk.VBox' object has no attribute 'present'
-if loaded.
-This is in the code path inherited from gdm-community-greeter - the debugging is in progress.
-
-## Near-future plans
-
-0. Fix bugs preventing layout widget from loading and connect it with "real" python code talking to xklavier instead of stubs.
-0. week #9 plans.
-
-## Additional notes
-
-0. From now on till the end of GSoC every week new version will be tagged in git repo - this should aid with testing.
-0. This week is one day shorter due to wedding. Luckily - not my own :)
-0. For the same reason weekly meeting is moved to one day earlier.
-
diff --git a/wiki/src/blueprint/bootstrapping/extension/prototype.mdwn b/wiki/src/blueprint/bootstrapping/extension/prototype.mdwn
index 0677ed6..73c1c7a 100644
--- a/wiki/src/blueprint/bootstrapping/extension/prototype.mdwn
+++ b/wiki/src/blueprint/bootstrapping/extension/prototype.mdwn
@@ -93,7 +93,7 @@
<div id="download">
<a id="download-button" href="[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]" class="btn btn-lg btn-primary clearfix">
<span id="download-button-label" class="pull-left">Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image
- <small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>
+ (<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)
</span>
<div id="download-button-state" class="pull-right">
<span id="download-button-state-retry" class="label label-warning">Retry</span>
diff --git a/wiki/src/blueprint/bootstrapping/tools.fodg b/wiki/src/blueprint/bootstrapping/tools.fodg
index c0c7bb6..eaf8c42 100644
--- a/wiki/src/blueprint/bootstrapping/tools.fodg
+++ b/wiki/src/blueprint/bootstrapping/tools.fodg
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.graphics">
- <office:meta><meta:initial-creator>Debian user</meta:initial-creator><meta:creation-date>2015-02-02T10:48:46</meta:creation-date><meta:generator>LibreOffice/3.5$Linux_x86 LibreOffice_project/350m1$Build-2</meta:generator><meta:document-statistic meta:object-count="38"/></office:meta>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.graphics">
+ <office:meta><meta:initial-creator>Debian user</meta:initial-creator><meta:creation-date>2015-02-02T10:48:46</meta:creation-date><meta:generator>LibreOffice/4.3.3.2$Linux_x86 LibreOffice_project/430m0$Build-2</meta:generator><dc:date>2016-02-07T19:33:31.339998128</dc:date><dc:creator>Debian user</dc:creator><meta:editing-duration>PT3M41S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:document-statistic meta:object-count="37"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
- <config:config-item config:name="VisibleAreaTop" config:type="int">-3704</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">-3175</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">42508</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">21789</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-3863</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-1323</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">42507</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">21788</config:config-item>
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
@@ -37,10 +37,10 @@
<config:config-item config:name="EditModeStandard" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeNotes" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeHandout" config:type="int">1</config:config-item>
- <config:config-item config:name="VisibleAreaTop" config:type="int">-5474</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">-16331</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">63136</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">41422</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-3863</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-1323</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">38471</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">23655</config:config-item>
<config:config-item config:name="GridCoarseWidth" config:type="int">1270</config:config-item>
<config:config-item config:name="GridCoarseHeight" config:type="int">1270</config:config-item>
<config:config-item config:name="GridFineWidth" config:type="int">127</config:config-item>
@@ -62,6 +62,7 @@
<config:config-item config:name="ColorTableURL" config:type="string">$(user)/config/standard.soc</config:config-item>
<config:config-item config:name="DashTableURL" config:type="string">$(user)/config/standard.sod</config:config-item>
<config:config-item config:name="DefaultTabStop" config:type="int">1270</config:config-item>
+ <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
<config:config-item config:name="GradientTableURL" config:type="string">$(user)/config/standard.sog</config:config-item>
<config:config-item config:name="HatchTableURL" config:type="string">$(user)/config/standard.soh</config:config-item>
<config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
@@ -96,14 +97,21 @@
</ooo:libraries>
</office:script>
</office:scripts>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="AR PL UKai CN" svg:font-family="&apos;AR PL UKai CN&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="DejaVu Sans" svg:font-family="&apos;DejaVu Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Lohit Devanagari" svg:font-family="&apos;Lohit Devanagari&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
<office:styles>
- <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z"/>
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/>
<style:default-style style:family="graphic">
<style:graphic-properties svg:stroke-color="#808080" draw:fill-color="#cfe7f5" fo:wrap-option="no-wrap"/>
<style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
<style:tab-stops/>
</style:paragraph-properties>
- <style:text-properties style:use-window-font-color="true" fo:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="24pt" fo:language="en" fo:country="US" style:font-family-asian="&apos;DejaVu Sans&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" style:font-family-complex="&apos;DejaVu Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="24pt" style:language-complex="hi" style:country-complex="IN"/>
+ <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Serif" fo:font-size="24pt" fo:language="en" fo:country="US" style:font-name-asian="DejaVu Sans" style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans" style:font-size-complex="24pt" style:language-complex="hi" style:country-complex="IN"/>
</style:default-style>
<style:style style:name="standard" style:family="graphic">
<style:graphic-properties draw:stroke="solid" svg:stroke-width="0cm" svg:stroke-color="#808080" draw:marker-start-width="0.2cm" draw:marker-start-center="false" draw:marker-end-width="0.2cm" draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#cfe7f5" draw:textarea-horizontal-align="justify" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080">
@@ -151,7 +159,7 @@
</text:list-style>
</style:graphic-properties>
<style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%" fo:text-indent="0cm"/>
- <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="18pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" style:font-family-asian="&apos;AR PL UKai CN&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-family-complex="&apos;Lohit Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
+ <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="18pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" style:font-name-asian="AR PL UKai CN" style:font-family-asian="&apos;AR PL UKai CN&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Lohit Devanagari" style:font-family-complex="&apos;Lohit Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
</style:style>
<style:style style:name="objectwitharrow" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:stroke="solid" svg:stroke-width="0.15cm" svg:stroke-color="#000000" draw:marker-start="Arrow" draw:marker-start-width="0.7cm" draw:marker-start-center="true" draw:marker-end-width="0.3cm"/>
@@ -162,6 +170,9 @@
<style:style style:name="objectwithoutfill" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties svg:stroke-color="#000000" draw:fill="none"/>
</style:style>
+ <style:style style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line" style:display-name="Object with no fill and no line" style:family="graphic" style:parent-style-name="standard">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+ </style:style>
<style:style style:name="text" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:stroke="none" draw:fill="none"/>
</style:style>
@@ -229,63 +240,60 @@
<style:graphic-properties svg:stroke-width="0.102cm" svg:stroke-color="#008080" draw:marker-start-width="0.353cm" draw:marker-end-width="0.353cm" draw:fill="solid" draw:fill-color="#ffffff" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.176cm" fo:padding-bottom="0.176cm" fo:padding-left="0.301cm" fo:padding-right="0.301cm"/>
</style:style>
<style:style style:name="gr4" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#e6ff00" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
+ <style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#99ff66" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
</style:style>
<style:style style:name="gr5" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#3deb3d" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
+ <style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#ffff66" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
</style:style>
- <style:style style:name="gr6" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#ffd320" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
- </style:style>
- <style:style style:name="gr7" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr6" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.2cm" svg:stroke-color="#800000" draw:marker-start-width="0.5cm" draw:marker-end="Arrow" draw:marker-end-width="0.6cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.225cm" fo:padding-bottom="0.225cm" fo:padding-left="0.35cm" fo:padding-right="0.35cm"/>
</style:style>
- <style:style style:name="gr8" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr7" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties svg:stroke-width="0.025cm" svg:stroke-color="#000000" draw:marker-start-width="0.237cm" draw:marker-end-width="0.237cm" draw:fill="solid" draw:fill-color="#ffffff" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.137cm" fo:padding-bottom="0.137cm" fo:padding-left="0.262cm" fo:padding-right="0.262cm"/>
</style:style>
- <style:style style:name="gr9" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr8" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.102cm" svg:stroke-color="#008080" draw:marker-start-width="0.353cm" draw:marker-end="Arrow" draw:marker-end-width="0.453cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.176cm" fo:padding-bottom="0.176cm" fo:padding-left="0.301cm" fo:padding-right="0.301cm"/>
</style:style>
- <style:style style:name="gr10" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr9" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.2cm" svg:stroke-color="#008080" draw:marker-start-width="0.5cm" draw:marker-end="Arrow" draw:marker-end-width="0.6cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.225cm" fo:padding-bottom="0.225cm" fo:padding-left="0.35cm" fo:padding-right="0.35cm"/>
</style:style>
- <style:style style:name="gr11" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr10" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.2cm" svg:stroke-color="#800080" draw:marker-start-width="0.5cm" draw:marker-end="Arrow" draw:marker-end-width="0.6cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.225cm" fo:padding-bottom="0.225cm" fo:padding-left="0.35cm" fo:padding-right="0.35cm"/>
</style:style>
- <style:style style:name="gr12" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr11" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.102cm" svg:stroke-color="#800000" draw:marker-start-width="0.353cm" draw:marker-end="Arrow" draw:marker-end-width="0.453cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.176cm" fo:padding-bottom="0.176cm" fo:padding-left="0.301cm" fo:padding-right="0.301cm"/>
</style:style>
- <style:style style:name="gr13" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr12" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr14" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr13" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.152cm" svg:stroke-color="#008080" draw:marker-start-width="0.428cm" draw:marker-end="Arrow" draw:marker-end-width="0.528cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.201cm" fo:padding-bottom="0.201cm" fo:padding-left="0.326cm" fo:padding-right="0.326cm"/>
</style:style>
- <style:style style:name="gr15" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr14" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties draw:marker-end="Arrow" draw:marker-end-width="0.3cm" draw:fill="none" draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr16" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr15" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" draw:marker-start-width="0.504cm" draw:marker-end="Arrow" draw:marker-end-width="0.604cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
- <style:style style:name="gr17" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr16" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.152cm" svg:stroke-color="#008080" draw:marker-start-width="0.228cm" draw:marker-end="Arrow" draw:marker-end-width="0.533cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.201cm" fo:padding-bottom="0.201cm" fo:padding-left="0.326cm" fo:padding-right="0.326cm"/>
</style:style>
- <style:style style:name="gr18" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr17" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" svg:stroke-color="#008080" draw:marker-end="Arrow" draw:marker-end-width="0.609cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
- <style:style style:name="gr19" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr18" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" svg:stroke-color="#800000" draw:marker-end="Arrow" draw:marker-end-width="0.609cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
- <style:style style:name="gr20" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr19" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" svg:stroke-color="#800000" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
- <style:style style:name="gr21" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr20" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.102cm" svg:stroke-color="#000000" draw:marker-start-width="0.153cm" draw:marker-end="Arrow" draw:marker-end-width="0.458cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.176cm" fo:padding-bottom="0.176cm" fo:padding-left="0.301cm" fo:padding-right="0.301cm"/>
</style:style>
- <style:style style:name="gr22" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr21" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" svg:stroke-color="#800080" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
- <style:style style:name="gr23" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr22" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties svg:stroke-width="0.203cm" svg:stroke-color="#800080" draw:marker-end="Arrow" draw:marker-end-width="0.609cm" draw:fill="none" draw:textarea-vertical-align="middle" fo:padding-top="0.226cm" fo:padding-bottom="0.226cm" fo:padding-left="0.351cm" fo:padding-right="0.351cm"/>
</style:style>
<style:style style:name="P1" style:family="paragraph">
@@ -365,132 +373,128 @@
<text:p text:style-name="P1"><text:span text:style-name="T1">Debian</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr2" draw:text-style-name="P2" xml:id="id6" draw:id="id6" draw:layer="layout" svg:width="5.882cm" svg:height="1.505cm" svg:x="1.078cm" svg:y="1.043cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Debian Hacker</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr2" draw:text-style-name="P2" xml:id="id5" draw:id="id5" draw:layer="layout" svg:width="5.882cm" svg:height="1.505cm" svg:x="1.078cm" svg:y="1.043cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Debian expert</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="5.945cm" svg:height="1.505cm" svg:x="18.842cm" svg:y="1.043cm">
+ <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P2" xml:id="id7" draw:id="id7" draw:layer="layout" svg:width="5.945cm" svg:height="1.505cm" svg:x="18.842cm" svg:y="1.043cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Other OS</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id2" draw:id="id2" draw:layer="layout" svg:width="8.721cm" svg:height="1.474cm" svg:x="7.627cm" svg:y="5.155cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Extension from Debian</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P2" xml:id="id7" draw:id="id7" draw:layer="layout" svg:width="10.541cm" svg:height="1.429cm" svg:x="1cm" svg:y="9.259cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id6" draw:id="id6" draw:layer="layout" svg:width="10.541cm" svg:height="1.429cm" svg:x="1cm" svg:y="9.259cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">OpenPGP with Debian keyring</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id4" draw:id="id4" draw:layer="layout" svg:width="9.937cm" svg:height="1.879cm" svg:x="19.536cm" svg:y="10.879cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id3" draw:id="id3" draw:layer="layout" svg:width="9.937cm" svg:height="1.879cm" svg:x="19.536cm" svg:y="10.879cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">OpenPGP documentation</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">(outside of the web assistant)</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr6" draw:text-style-name="P2" xml:id="id3" draw:id="id3" draw:layer="layout" svg:width="9.028cm" svg:height="1.505cm" svg:x="17.269cm" svg:y="5.155cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Extension from browser</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P2" xml:id="id2" draw:id="id2" draw:layer="layout" svg:width="9.028cm" svg:height="1.505cm" svg:x="15.58cm" svg:y="5.155cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Browser extension</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="11.954cm" svg:y1="2.548cm" svg:x2="11.988cm" svg:y2="5.155cm" draw:start-shape="id1" draw:start-glue-point="6" draw:end-shape="id2" draw:end-glue-point="4" svg:d="m11954 2548v551l34 1543v513">
+ <draw:connector draw:style-name="gr6" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="11.954cm" svg:y1="2.548cm" svg:x2="20.094cm" svg:y2="5.155cm" draw:start-shape="id1" draw:start-glue-point="6" draw:end-shape="id2" draw:end-glue-point="4" svg:d="M11954 2548v551l8140 1542v514" svg:viewBox="0 0 8141 2608">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id5" draw:id="id5" draw:layer="layout" svg:width="4.398cm" svg:height="1.684cm" svg:x="12.749cm" svg:y="12.363cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id4" draw:id="id4" draw:layer="layout" svg:width="4.398cm" svg:height="1.684cm" svg:x="12.749cm" svg:y="12.363cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Verified ISO</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.783cm" svg:y1="6.66cm" svg:x2="24.505cm" svg:y2="10.879cm" draw:start-shape="id3" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="4" svg:d="m21783 6660v513l2722 3192v514">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="20.094cm" svg:y1="6.66cm" svg:x2="24.505cm" svg:y2="10.879cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id3" draw:end-glue-point="4" svg:d="M20094 6660v513l4411 3192v514" svg:viewBox="0 0 4412 4220">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.783cm" svg:y1="6.66cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id3" draw:start-glue-point="6" draw:end-shape="id5" draw:end-glue-point="7" svg:d="m21783 6660v513l-4122 6032h-514">
+ <draw:connector draw:style-name="gr9" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="20.094cm" svg:y1="6.66cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="7" svg:d="M20094 6660v513l-2433 6032h-514" svg:viewBox="0 0 2948 6546">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="11.988cm" svg:y1="6.629cm" svg:x2="14.948cm" svg:y2="12.363cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id5" draw:end-glue-point="4" svg:d="m11988 6629v514l2960 4707v513">
+ <draw:connector draw:style-name="gr6" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="15.58cm" svg:y1="5.908cm" svg:x2="14.948cm" svg:y2="12.363cm" draw:start-shape="id2" draw:start-glue-point="5" draw:end-shape="id4" draw:end-glue-point="4" svg:d="M15580 5908h-513l-119 5942v513" svg:viewBox="0 0 633 6456">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr11" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="4.019cm" svg:y1="2.548cm" svg:x2="6.271cm" svg:y2="9.259cm" draw:start-shape="id6" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="4" svg:d="m4019 2548v551l2252 5646v514">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="4.019cm" svg:y1="2.548cm" svg:x2="6.271cm" svg:y2="9.259cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id6" draw:end-glue-point="4" svg:d="M4019 2548v551l2252 5646v514" svg:viewBox="0 0 2253 6712">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr11" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="6.271cm" svg:y1="10.688cm" svg:x2="12.749cm" svg:y2="13.205cm" draw:start-shape="id7" draw:start-glue-point="6" draw:end-shape="id5" svg:d="m6271 10688v513l5965 2004h513">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="6.271cm" svg:y1="10.688cm" svg:x2="12.749cm" svg:y2="13.205cm" draw:start-shape="id6" draw:start-glue-point="6" draw:end-shape="id4" svg:d="M6271 10688v513l5965 2004h513" svg:viewBox="0 0 6479 2518">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.815cm" svg:y1="2.548cm" svg:x2="21.783cm" svg:y2="5.155cm" draw:start-shape="id8" draw:start-glue-point="6" draw:end-shape="id3" draw:end-glue-point="4" svg:d="m21815 2548v551l-32 1542v514">
+ <draw:connector draw:style-name="gr9" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.815cm" svg:y1="2.548cm" svg:x2="20.094cm" svg:y2="5.155cm" draw:start-shape="id7" draw:start-glue-point="6" draw:end-shape="id2" draw:end-glue-point="4" svg:d="M21815 2548v551l-1721 1542v514" svg:viewBox="0 0 1722 2608">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr12" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="11.988cm" svg:y1="6.629cm" svg:x2="11.541cm" svg:y2="9.974cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="7" svg:d="m11988 6629v514l66 2831h-513">
+ <draw:connector draw:style-name="gr11" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="15.58cm" svg:y1="5.907cm" svg:x2="11.541cm" svg:y2="9.974cm" draw:start-shape="id2" draw:end-shape="id6" draw:end-glue-point="7" svg:d="M15580 5907h-513l-3013 4067h-513" svg:viewBox="0 0 4040 4068">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="24.505cm" svg:y1="12.758cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id4" draw:start-glue-point="6" draw:end-shape="id5" draw:end-glue-point="7" svg:d="m24505 12758v513l-6844-66h-514">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="24.505cm" svg:y1="12.758cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id3" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="7" svg:d="M24505 12758v513l-6844-66h-514" svg:viewBox="0 0 7359 514">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id14" draw:id="id14" draw:layer="layout" svg:width="5.471cm" svg:height="1.683cm" svg:x="2.763cm" svg:y="27.795cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id13" draw:id="id13" draw:layer="layout" svg:width="5.471cm" svg:height="1.683cm" svg:x="2.763cm" svg:y="27.795cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Tails Installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="4.191cm" svg:height="1.683cm" svg:x="20.304cm" svg:y="18.296cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id9" draw:id="id9" draw:layer="layout" svg:width="4.191cm" svg:height="1.683cm" svg:x="20.304cm" svg:y="18.296cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">UUI</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">(for Windows)</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id9" draw:id="id9" draw:layer="layout" svg:width="4.397cm" svg:height="1.684cm" svg:x="25.035cm" svg:y="18.263cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Disk Utility</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="4.397cm" svg:height="1.684cm" svg:x="25.035cm" svg:y="18.263cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">dd</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">(for Mac)</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id12" draw:id="id12" draw:layer="layout" svg:width="6.026cm" svg:height="1.683cm" svg:x="13.673cm" svg:y="18.283cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id11" draw:id="id11" draw:layer="layout" svg:width="6.026cm" svg:height="1.683cm" svg:x="13.673cm" svg:y="18.283cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">GNOME Disks</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">(for other Linux)</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id13" draw:id="id13" draw:layer="layout" svg:width="5.882cm" svg:height="1.683cm" svg:x="14.132cm" svg:y="23.501cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id12" draw:id="id12" draw:layer="layout" svg:width="5.882cm" svg:height="1.683cm" svg:x="14.132cm" svg:y="23.501cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Temporary Tails</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="17.147cm" svg:y1="13.205cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id5" draw:start-glue-point="1" draw:end-shape="id5" draw:end-glue-point="1" svg:d="m17147 13205">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="17.147cm" svg:y1="13.205cm" svg:x2="17.147cm" svg:y2="13.205cm" draw:start-shape="id4" draw:start-glue-point="1" draw:end-shape="id4" draw:end-glue-point="1" svg:d="M17147 13205z" svg:viewBox="0 0 1 1">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id11" draw:id="id11" draw:layer="layout" svg:width="4.398cm" svg:height="1.683cm" svg:x="8.904cm" svg:y="23.469cm">
+ <draw:custom-shape draw:style-name="gr7" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="4.398cm" svg:height="1.683cm" svg:x="8.904cm" svg:y="23.469cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Burn DVD</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="27.234cm" svg:y2="18.263cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id9" draw:end-glue-point="4" svg:d="m14948 14047v514l12286 3189v513">
+ <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="27.233cm" svg:y2="18.263cm" draw:start-shape="id4" draw:start-glue-point="6" draw:end-shape="id8" draw:end-glue-point="4" svg:d="M14948 14047v514l12285 3189v513" svg:viewBox="0 0 12286 4217">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="22.4cm" svg:y2="18.296cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id10" draw:end-glue-point="4" svg:d="m14948 14047v514l7452 3221v514">
+ <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="22.399cm" svg:y2="18.296cm" draw:start-shape="id4" draw:start-glue-point="6" draw:end-shape="id9" draw:end-glue-point="4" svg:d="M14948 14047v514l7451 3221v514" svg:viewBox="0 0 7452 4250">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr15" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="12.363cm" svg:x2="14.948cm" svg:y2="12.363cm" draw:start-shape="id5" draw:start-glue-point="0" draw:end-shape="id5" svg:d="m14948 12363v-513 0">
+ <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="12.363cm" svg:x2="14.948cm" svg:y2="12.363cm" draw:start-shape="id4" draw:start-glue-point="0" draw:end-shape="id4" svg:d="M14948 12363v-513z" svg:viewBox="0 0 1 514">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="11.103cm" svg:y2="23.469cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id11" draw:end-glue-point="4" svg:d="m14948 14047v514l-3845 8394v514">
+ <draw:connector draw:style-name="gr15" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="11.103cm" svg:y2="23.469cm" draw:start-shape="id4" draw:start-glue-point="6" draw:end-shape="id10" draw:end-glue-point="4" svg:d="M14948 14047v514l-3845 8394v514" svg:viewBox="0 0 3846 9423">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="16.686cm" svg:y2="18.283cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id12" draw:end-glue-point="4" svg:d="m14948 14047v514l1738 3208v514">
+ <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="16.686cm" svg:y2="18.283cm" draw:start-shape="id4" draw:start-glue-point="6" draw:end-shape="id11" draw:end-glue-point="4" svg:d="M14948 14047v514l1738 3208v514" svg:viewBox="0 0 1739 4237">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="27.234cm" svg:y1="19.947cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id9" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m27234 19947v514l-10161 2526v514">
+ <draw:connector draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="27.233cm" svg:y1="19.947cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id8" draw:start-glue-point="6" draw:end-shape="id12" draw:end-glue-point="4" svg:d="M27233 19947v514l-10160 2526v514" svg:viewBox="0 0 10161 3555">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="22.4cm" svg:y1="19.979cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m22400 19979v513l-5327 2495v514">
+ <draw:connector draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="22.399cm" svg:y1="19.979cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id9" draw:start-glue-point="6" draw:end-shape="id12" draw:end-glue-point="4" svg:d="M22399 19979v513l-5326 2495v514" svg:viewBox="0 0 5327 3523">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="16.686cm" svg:y1="19.966cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id12" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m16686 19966v513l387 2508v514">
+ <draw:connector draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="16.686cm" svg:y1="19.966cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id11" draw:start-glue-point="6" draw:end-shape="id12" draw:end-glue-point="4" svg:d="M16686 19966v513l387 2508v514" svg:viewBox="0 0 388 3536">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="17.073cm" svg:y1="25.184cm" svg:x2="8.234cm" svg:y2="28.636cm" draw:start-shape="id13" draw:start-glue-point="6" draw:end-shape="id14" svg:d="m17073 25184v513l-8326 2939h-513">
+ <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="17.073cm" svg:y1="25.184cm" svg:x2="8.234cm" svg:y2="28.636cm" draw:start-shape="id12" draw:start-glue-point="6" draw:end-shape="id13" svg:d="M17073 25184v513l-8326 2939h-513" svg:viewBox="0 0 8840 3453">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" draw:type="line" svg:x1="5.494cm" svg:y1="17.323cm" svg:x2="5.499cm" svg:y2="27.795cm" draw:end-shape="id14" draw:end-glue-point="4" svg:d="m5494 17323 5 10472">
+ <draw:connector draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" draw:type="line" svg:x1="5.494cm" svg:y1="17.323cm" svg:x2="5.499cm" svg:y2="27.795cm" draw:end-shape="id13" draw:end-glue-point="4" svg:d="M5494 17323l5 10472" svg:viewBox="0 0 6 10473">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr20" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="5.446cm" svg:y2="17.323cm" draw:start-shape="id5" draw:start-glue-point="6" svg:d="m14948 14047v514l-9502 2762v0">
+ <draw:connector draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="5.446cm" svg:y2="17.323cm" draw:start-shape="id4" draw:start-glue-point="6" svg:d="M14948 14047v514l-9502 2762" svg:viewBox="0 0 9503 3277">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr21" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="11.103cm" svg:y1="25.152cm" svg:x2="8.234cm" svg:y2="28.636cm" draw:start-shape="id11" draw:start-glue-point="6" draw:end-shape="id14" draw:end-glue-point="7" svg:d="m11103 25152v513l-2356 2971h-513">
+ <draw:connector draw:style-name="gr20" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="11.103cm" svg:y1="25.152cm" svg:x2="8.234cm" svg:y2="28.636cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="7" svg:d="M11103 25152v513l-2356 2971h-513" svg:viewBox="0 0 2870 3485">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr22" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="4.36cm" svg:y2="17.104cm" draw:start-shape="id5" draw:start-glue-point="6" svg:d="m14948 14047v514l-10588 2543v0">
+ <draw:connector draw:style-name="gr21" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="4.36cm" svg:y2="17.104cm" draw:start-shape="id4" draw:start-glue-point="6" svg:d="M14948 14047v514l-10588 2543" svg:viewBox="0 0 10589 3058">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr23" draw:text-style-name="P1" draw:layer="layout" draw:type="line" svg:x1="4.435cm" svg:y1="17.142cm" svg:x2="4.466cm" svg:y2="27.851cm" svg:d="m4435 17142 31 10709">
+ <draw:connector draw:style-name="gr22" draw:text-style-name="P1" draw:layer="layout" draw:type="line" svg:x1="4.435cm" svg:y1="17.142cm" svg:x2="4.466cm" svg:y2="27.851cm" svg:d="M4435 17142l31 10709" svg:viewBox="0 0 32 10710">
<text:p/>
</draw:connector>
</draw:page>
diff --git a/wiki/src/blueprint/bootstrapping/verification.mdwn b/wiki/src/blueprint/bootstrapping/verification.mdwn
index 35f0edb..f8b7eca 100644
--- a/wiki/src/blueprint/bootstrapping/verification.mdwn
+++ b/wiki/src/blueprint/bootstrapping/verification.mdwn
@@ -1,5 +1,7 @@
[[!meta title="ISO verification"]]
+[[!toc]]
+
Vision
======
diff --git a/wiki/src/blueprint/follow_parts_of_Redmine.mdwn b/wiki/src/blueprint/follow_parts_of_Redmine.mdwn
new file mode 100644
index 0000000..e743879
--- /dev/null
+++ b/wiki/src/blueprint/follow_parts_of_Redmine.mdwn
@@ -0,0 +1,15 @@
+[Some of us need](https://mailman.boum.org/pipermail/tails-dev/2016-February/010204.html)
+to follow subsets of the changes made in our Redmine, without
+following _everything_.
+
+# Brainstorming
+
+## Criteria
+
+* Category
+* Type of work
+* Affected tool
+
+## Notification
+
+* email notifications work fine
diff --git a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
index 3bcedaa..39a9edf 100644
--- a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
+++ b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
@@ -1,86 +1,133 @@
+This is about [[!tails_ticket 11009]] and related tickets.
+
+[[!toc levels=2]]
+
Rationale
=========
In [[!tails_ticket 9264]], we're discussing and drafting our needs for more
isotesters. From some statistics of the number of automated builds per month,
we concluded we need to be able to run at least 1000 more test suites per
-month, which means being able to host at least 8 more isotesters.
+month.
-Note: our workload parallelizes poorly over multiple CPU cores, so
-perhaps getting _less_ additional ISO testers, but each with faster
-CPU clock, would be more efficient.
+Note: our workload parallelizes poorly over multiple CPU cores per ISO tester,
+so we need to get more ISO testers and/or ISO testers with faster CPU clock.
Estimates
=========
-As a reminder, we are discussing in [[!tails_ticket 10396]] that one
-isotester means:
+As a reminder, one isotester means:
- * 20G RAM
+ * at least 20 GiB RAM, preferably 23 GiB
* 25G HDD (10G system+data, 15G tmp)
* 3 CPU threads
-So 8 isotesters would mean:
+On [[!tails_ticket 9264]] we concluded that we want to be able to run the test
+suite 1350 times per month. Each of our current isotesters on lizard v2 can run
+it about 120 times a month. We have four such VMs => we can already cope with
+480 times a month => we need to find out how to run it 1350 - 480 = 870 more
+times a month.
+
+# Upgrading lizard v2
+
+We are seriously under-using lizard v2's CPU power. Let's try to fix this in
+a way that solves at least part of the performance problems we currently have:
+[[!tails_ticket 9264]] and [[!tails_ticket 10999]].
+
+Experiments conducted on [[!tails_ticket 10996]] showed that we can probably
+run the test suite 25-35% more times on lizard, if we gave it 49 GiB more RAM
+and run 6 isotesters with 23 GiB RAM each. This brings us to something between
+480 * 1.25 = 600 and 480 * 1.35 = 648 runs a month. It might be that we can even
+run 8 isotesters efficiently, given 95 GiB more RAM than we currently have, but
+let's not count on it.
- * 160G RAM
- * 200G HDD
- * 24 CPU threads max
+This still covers only about half of our needs. So we'll need a second machine
+to host more ISO testers at some point: see below.
-From there, it seems unlikely we could host that on Lizard, and we are
-back on the research about new hardware for isotesters.
+Also, as seen on [[!tails_ticket 10999]], we could make use of more
+ISO builders, and here again, lizard could cope with this workload if we gave it
+18 more GiB of RAM.
-Hardware
-========
+So, giving lizard 48+18 = 66 or 95+18 = 113 GiB more RAM would fix part of the
+problems we currently have, use more of our currently available computing power
+(which would be satisfying in itself), and teach us lots of things about how to
+set up and optimize systems to cope with our ISO testing workload.
-Given the amount of RAM and CPUs required, it seems close to [[Lizard's
-specs|blueprint/hardware_for_automated_tests]].
+IMO (intrigeri) this would allow us to more cleverly pick hardware for the
+second ISO testing machine when we come to it. I think we should go with the
+higher option (which means upgrading to 256 GiB of RAM), that gives us more
+flexibility to experiment with various numbers of ISO builders and testers, and
+worst case RAM would always be useful for running more services we're asked to
+set up, and for improving performance thanks to disk caches.
-We still need to decide if we would use faster (as in Ghz) CPUs than the one
-Lizard has (Low voltages versions). In this case the price jumps quite a bit,
-and the electic bill will too (120W each for that kind of CPUs, against the 65W
-each of Lizard's ones).
+# A second machine
-The following price estimations are based on interpromicro.com ones.
+**Note**: IMO (intrigeri) we should experiment on lizard with more RAM
+before we make the final decision here, but this should not block us from
+drafting possible solutions :)
+
+For reference, see [[lizard's specs|blueprint/hardware_for_automated_tests]].
+
+Assuming we have upgraded lizard as explained above, we need a second machine
+able to run the test suite about 700-750 times a month. If each ISO tester on
+that second machine was exactly as fast as those we have on lizard, then we
+would need 6 ISO testers on the new machine. But it's not a given: we can
+probably get faster ISO testers on the new machine; how many ISO testers it will
+run, and how many CPU cores and how much RAM it needs, depends on how fast each
+CPU core is. Economically speaking, faster CPU cores can save money on RAM
+(because we can achieve the same throughput with fewer ISO testers), but they
+cost more in electricity.
+
+The following price estimates are based on <http://interpromicro.com/> ones.
## Candidate options
-We currently prefer option C if it's doable, and option D otherwise.
+**Note**: the following selection of candidates is outdated, as it doesn't take
+into account the most recent developments on this topic (see above). E.g. 4-6
+new ISO testers will probably be enough, and in turn we may be instead looking
+for something like:
-### Option C: 12 cores, upgradable by adding a CPU
+* 128 GiB of RAM (ideally we would just reuse the 128 GiB we have in lizard v2)
+* 12-18 CPU threads == 6-9 CPU cores
-XXX:
+<a id="option_D"></a>
-* can we plug one CPU only on a 2-sockets SMP mobo?
- => ask taggart
-* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
- with 3 real cores each, then we need less RAM (~ $1000 less)
- => depends on the outcome of [[!tails_ticket 10971]]
+### Option D: 2*6 cores, upgradable by replacing CPUs
+
+This is for 8 VMs with 3 vcpus each.
+
+Specs:
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
- * 1 x Intel® E5-2690v3-2.6Ghz/12C, 30M, 135W LGA2011 CPU - $2124
- * 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
+ * 2 x Intel® E5-2643v3, 6C, 3.4GHz, 135 - $3260
+ * 16 x 8GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $0
* 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
- * 1 x Heatsink - $50
+ * 2 x Heatsink - $100
* 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
-Total --- **$5424**
+Total --- **$4500**
-### Option D: 2*6 cores, upgradable by replacing CPUs
+<a id="option_E"></a>
-XXX:
+### Option E: 8 cores, Haswell, single socket
-* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
- with 3 real cores each, then we need less RAM (~ $1000 less)
- => depends on the outcome of [[!tails_ticket 10971]]
+Single socket boards that support E5-1600 CPUs and hold 8 DIMMs (up to
+512GB of RAM):
+<http://www.supermicro.com/products/motherboard/Xeon3000/#2011>
- * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
- * 2 x Intel® E5-2643v3, 6C, 3.4GHz, 135 - $3260
- * 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
+XXX: pick a mobo that has 16 DIMM slots, all those have 8 slots; or
+deal with the fact it has 8 slots only.
+
+Specs:
+
+ * 1 x X10SRi-F - $273.05
+ * 1 x [E5-1680 v3](http://ark.intel.com/products/82767), 8C, 3.2GHz, 140W - $1829.65
+ * 16 x 8GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $0
* 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
* 1 x Heatsink - $50
- * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
+ * 1 x case FIXME - $350
-Total --- **$6675**
+Total --- around **$2900**
## Deprecated options
@@ -110,22 +157,22 @@ Total --- **$6200**
Total --- **$6650**
-## Ways to lower the price a bit
+<a id="option_C"></a>
+
+### Option C: 12 cores, upgradable by adding a CPU
-No need to invest time into it immediately, but if we eventually decide
-to go this way and the total price is a bit too high, we should look
-into these options.
+We can't plug one CPU only on a 2-sockets SMP mobo without
+losing functionality.
-### Less RAM
+This is for 8 VMs with 3 vcpus each.
-Here, we pay for the test suite's temporary storage twice: once in RAM
-(disk cache managed by the kernel), once on disk. We could cut down on
-costs a bit by not buying all the corresponding RAM now, and instead
-relying purely on the SSDs (buy 128GB instead of 256GB for the new
-machine, which saves ~$1k).
+Specs:
-I'm curious what would be the performance hit if we did that. I guess
-it's easy enough to get a first very rough estimate (just give an
-isotesterN 10GB of RAM instead of 20GB, or something), but really it all
-depends on how the drives handle _multiple_ instances of the test suite
-writing/reading tons of data.
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
+ * 1 x Intel® E5-2690v3-2.6Ghz/12C, 30M, 135W LGA2011 CPU - $2124
+ * 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
+ * 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
+ * 1 x Heatsink - $50
+ * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
+
+Total --- **$5424**
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 10aedfd..4de79c5 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -1,5 +1,86 @@
[[!toc levels=2]]
+#Proposta prime Branch
+Sono 8!
+
+doc_about
+
+./doc/about
+./doc/about/features
+./doc/about/fingerprint
+./doc/about.index
+./doc/about/license
+./doc/about/openpgp_keys
+./doc/about/requirements
+./doc/about/tor
+./doc/about/trust
+./doc/about/warning
+
+doc_first_step_ABIM
+
+./doc/first_steps
+./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/media
+
+doc_installation
+
+./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_persistence
+
+./doc/first_steps/persistence
+./doc/first_steps/persistence.caution
+./doc/first_steps/persistence/configure
+./doc/first_steps/persistence/delete
+./doc/first_steps/persistence/use
+./doc/first_steps/persistence/warnings
+
+doc_first_step_start
+
+./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_step_RUS
+
+./doc/first_steps/reset
+./doc/first_steps/reset.intro
+./doc/first_steps/reset/linux
+./doc/first_steps/reset/windows
+./doc/first_steps/upgrade
+./doc/first_steps/shutdown
+
+
+doc_get
+
+./doc/get.index
+./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
+
+first_level
+
+./download
+./getting_started
+./index
+./sidebar
+./support
+./about
+./doc
+
# Dizionario
<http://tp.linux.it/glossario.html>
@@ -322,30 +403,30 @@ ___
# Documenti Revisionati
Dancus
-./doc/first_steps/persistence/warninzeyev REVISIONATO
+./doc/first_steps/persistence/warninzeyev REVISIONATO
./doc/first_steps/shutdown REVISIONATO
./doc/first_steps/start_tails REVISIONATO
-./doc/first_steps/startup_option/administration_password
+./doc/first_steps/startup_option/administration_password REVISIONATO
-./doc/first_steps/startup_options/bridge_mode
+./doc/first_steps/startup_options/bridge_mode REVISIONATO
+REVISIONATO
+./doc/first_steps/startup_options/mac_spoofing
-./doc/first_steps/startup_options/mac_spoofing
-
-./doc/first_steps/startup_options/network_configuration
+./doc/first_steps/startup_options/network_configuration REVISIONATO
-./doc/first_steps/startup_options/windows_camouflage
+./doc/first_steps/startup_options/windows_camouflage REVISIONATO
-------------------------------------------------------------------
Blackflag
-doc/about/tor.it.html REVISIONATO ("Tor ama le compagnie?")
+doc/about/tor.it.html REVISIONATO
-about/trust.it.po (il file è ok ma sul sito locale sembra ancora da tradurre...)
+about/trust.it.po REVISIONATO
-about/warning.it.po (manca circa 1/3 della traduzione)
+about/warning.it.po REVISIONATO
doc/first_steps/shutdown.it.po REVISIONATO
@@ -376,3 +457,23 @@ Igni
./doc/first_steps/persistence/warnings --FINITO!
________________________________________
+
+Zeyev
+
+./doc/about/license --FINITO
+
+./doc/about/requirements --FINITO
+
+./doc/get.index --FINITO
+
+./doc/get/trusting_tails_signing_key --FINITO
+
+./doc/get/verify_the_iso_image_using_gnome --FINITO
+
+./doc/get/verify_the_iso_image_using_other_operating_systems --FINITO
+
+./doc/get/verify_the_iso_image_using_the_command_line --FINITO
+
+./download.it.po --FINITO
+
+________________________________________
diff --git a/wiki/src/blueprint/monitor_servers.mdwn b/wiki/src/blueprint/monitor_servers.mdwn
index 470f57e..c8f933a 100644
--- a/wiki/src/blueprint/monitor_servers.mdwn
+++ b/wiki/src/blueprint/monitor_servers.mdwn
@@ -36,7 +36,7 @@ Corresponding parent ticket: [[!tails_ticket 5734]]
Here, we call:
-* _machine_: a computer (be it bare metal or physical) and its
+* _machine_: a computer (be it bare metal or virtual) and its
operating system
* _monitored machine_: a machine we monitor
* _monitoring machine_: the machine(s) that monitors the... _monitored
@@ -62,11 +62,11 @@ The monitoring system:
interface that works within Tor Browser with the security slider set
to Medium-High.
* MAY additionally offer a read-only version of this overview, that we
- MAY want to make available to selected contributors, or anonymous
+ may want to make available to selected contributors, or anonymous
users. Needless to say, this must be carefully balanced with the
security implications of such a system (in other words, a set of
exported static HTML pages is totally fine, but a huge dynamic web
- application is probably a no-starter).
+ application is probably a non-starter).
* MUST support configuring, with a per-check/per-service granularity,
a threshold of N failures _in a row_ before an alert is raised.
Still, it SHOULD support triggering alerts depending on the
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 8aaee86..778c7a9 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -15,3 +15,8 @@ Availability and plans for the next weeks
Discussions
===========
+- [[!tails_ticket 11027 desc="Decide what to do with the old OpenPGP verification instructions"]]
+- [[!tails_ticket 10781 desc="Investigate how to support the download of ISO images from release candidates"]]
+- [[!tails_ticket 11047 desc="Decide how to handle the upcoming monthly reports"]]
+- [[!tails_ticket 10915 desc="Consider publishing torrents for betas and RCs"]]
+- [[!tails_ticket 11099 desc="Decide which pinentry we want to ship"]]
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
new file mode 100644
index 0000000..d405965
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -0,0 +1,15 @@
+[[!meta title="Monthly reports"]]
+
+[[!map pages="blueprint/monthly_report/*" show="title"]]
+
+This page could be a good place to gather HOWTO, tips, template, etc.
+for the monthly reports.
+
+- Check the archives of:
+ - <https://mailman.boum.org/pipermail/tails-dev/>
+ - <https://mailman.boum.org/pipermail/tails-ux/>
+ - <https://mailman.boum.org/pipermail/tails-project/>
+- Explore the Git history:
+ - git log --since="January 1" --until="February 1"
+- Redmine view of closed issues:
+ - https://labs.riseup.net/code/projects/tails/issues?utf8=%E2%9C%93&set_filter=1&f[]=closed_on&op[closed_on]=%3E%3C&v[closed_on][]=2016-01-01&v[closed_on][]=2016-01-31&f[]=&c[]=tracker&c[]=status&c[]=priority&c[]=subject&c[]=author&c[]=assigned_to&c[]=updated_on&c[]=cf_9&group_by=
diff --git a/wiki/src/blueprint/monthly_report/report_2015_12.mdwn b/wiki/src/blueprint/monthly_report/report_2015_12.mdwn
new file mode 100644
index 0000000..2300fea
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2015_12.mdwn
@@ -0,0 +1,112 @@
+[[!meta title="Tails report from September to December 2015"]]
+
+The last report about august has been published a short while ago and now we present to you the combined reports from September to December 2015. We were quite busy and didn't find the time to write seperate reports since August 2015.
+This report covers the last third of 2015.
+
+Releases
+========
+
+* [[Tails 1.6 was released on September 22, 2015.|news/version_1.6]] (major release)
+
+* [[Tails 1.7 was released on November 3, 2015.|news/version_1.7]] (major release)
+
+* [[Tails 1.8 was released on December 15, 2015.|news/version_1.8]] (major release)
+
+* [[Tails 1.8.1 was released on December 19, 2015.|news/version_1.8.1]] (minor release)
+
+Code
+====
+
+For details, see each release announcement. Notable changes include:
+
+* 1.7: You can now start Tails in [[offline mode|doc/first_steps/startup_options/offline_mode]]
+ to disable all networking for additional security. Doing so can be
+ useful when working on sensitive documents.
+
+* 1.8: <span class="application">[[Icedove|doc/anonymous_internet/icedove]]</span>, a
+ rebranded version of <span class="application">Mozilla Thunderbird</span>, is
+ now the official email client in Tails, replacing
+ <span class="application">Claws Mail</span>.
+ As with Claws, Icedove allows you to encrypt and decrypt emails easily and sends all
+ traffic through the Tor network.
+
+Infrastructure
+==============
+
+ - We were able to deploy automated tests of ISO images built
+ automatically for our main release branches in the beginning of
+ October.
+
+ - The new snapshot system improved robustness of our test suite
+ noticeably, and reduced the amount of time needed for a full run
+ with at least 30%.
+
+User experience
+===============
+
+ - Alan wrote a prototype for a new version of Tails Greeter and we
+ [conducted user testing](https://mailman.boum.org/pipermail/tails-ux/2015-November/000791.html) of it.
+
+ - Lunar started a discussion on [redesigning the process to connect to a
+ network and configure Tor](https://mailman.boum.org/pipermail/tails-ux/2015-October/000659.html).
+
+ - sajolida proposed some improvements to WhisperBack regarding [language
+ flagging and OpenPGP keys](https://mailman.boum.org/pipermail/tails-ux/2015-November/000801.html).
+
+Documentation and website
+=========================
+
+- We published our [[Installation Assistant|install]] to make it easier
+ to get started with Tails.
+
+- Giorgio Maone wrote a [Firefox add-on](https://addons.mozilla.org/en-US/firefox/addon/tails-download-and-verify/?src=search)
+ to verify the Tails ISO image automatically.
+
+- We published a statement [[about creating Tails derivatives|contribute/derivatives]].
+
+Website
+=======
+
+* The Tails website is now available in [Farsi](https://tails.boum.org/index.fa.html). Thanks to all Farsi translators and the [LocalizationLab](http://localizationlab.org).
+
+Outreach
+========
+
+* Syl held a Tails Workshop at Bazar du Libre on November 22 in Toulouse, France.
+
+* We had a table at 32C3, in Hamburg, Germany.
+
+Press and Testimonials
+======================
+
+* 2015-09-24: [Open Source Privacy: Tails OS Issues Security Fixes and New Release](http://thevarguy.com/open-source-application-software-companies/092415/open-source-privacy-tails-os-issues-security-fixes-and-ne) by Christopher Tozzi on The VAR Guy.
+
+* 2015-10-05: [Be completely anonymous online](http://www.postandcourier.com/article/20151005/PC05/151009881/1002/be-completely-anonymous-online) by Kim Komando in The Post and Courier.
+
+Metrics
+=======
+
+In September 2015:
+
+* Tails has been started more than 473,295 times in September. This makes 15,268 boots a day on average.
+* 29,135 downloads of the OpenPGP signature of Tails ISO from our website.
+* 90 bug reports were received through WhisperBack.
+
+In October 2015:
+
+* Tails has been started more than 500,551 times in October. This makes 16,147 boots a day on average.
+* 25,790 downloads of the OpenPGP signature of Tails ISO from our website.
+* 71 bug reports were received through WhisperBack.
+
+In November 2015:
+
+* Tails has been started more than 540,362 times in November. This makes 18,012 boots a day on average.
+* 34,881 downloads of the OpenPGP signature of Tails ISO from our website.
+* 95 bug reports were received through WhisperBack.
+
+In December 2015:
+
+* Tails has been started more than 546,366 times in December. This makes 17,6245 boots a day on average.
+* 35,853 downloads of the OpenPGP signature of Tails ISO from our website.
+* 109 bug reports were received through WhisperBack.
+* sajolida published statistics on [the time before upgrade](https://mailman.boum.org/pipermail/tails-dev/2015-November/009803.html)
diff --git a/wiki/src/blueprint/monthly_report/report_2016_01.mdwn b/wiki/src/blueprint/monthly_report/report_2016_01.mdwn
new file mode 100644
index 0000000..0979d81
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_01.mdwn
@@ -0,0 +1,109 @@
+[[!meta title="Tails report for January, 2016"]]
+
+January has been a busy month with two releases including Tails 2.0.
+
+[[!toc]]
+
+Releases
+========
+
+* [[Tails 1.8.2 was released on January 10, 2016|news/version_1.8.2]] (minor release).
+
+* [[Tails 2.0 was released on January 26, 2016|news/version_2.0]] (major release).
+
+* The next release (2.2) is [[planned for March 08|https://tails.boum.org/contribute/calendar/]].
+
+The following changes were introduced in Tails 2.0:
+
+[[!inline pages="inc/release_notes/2.0" raw="yes"]]
+
+Code
+====
+
+- Andrew Gallagher wrote a [tool to clone and backup the persistent
+ volume](https://mailman.boum.org/pipermail/tails-dev/2016-January/010033.html). Testing is welcome!
+
+- Christian Medel is working on a [replacement for the defunct Windows
+ Camouflage](https://mailman.boum.org/pipermail/tails-dev/2016-January/010084.html).
+
+Documentation and website
+=========================
+
+- Most of our documentation was updated to Tails based on Jessie.
+
+User experience
+===============
+
+* Tails Installer is now available in [Debian](https://tracker.debian.org/pkg/tails-installer)
+ and [Ubuntu](https://launchpad.net/~tails-team/+archive/ubuntu/tails-installer)
+
+Infrastructure
+==============
+
+* Our test suite covers 208 scenarios, 17 more than in August.
+
+Outreach
+========
+
+* A Tails install party took place in Toulouse, France to celebrate the Tails 2.0 release.
+
+Upcoming events
+---------------
+
+* We will participate at the [Internet Freedom Festival](https://internetfreedomfestival.org/)
+ in Valencia, Spain from 1st-6th March 2016.
+
+* We will be at the [Logan CIJ Symposium "Challenge Power"](http://logancij.com),
+ 11-12th March 2016 in Berlin, Germany.
+
+On-going discussions
+====================
+
+* sycamoreone started started working on a [blueprint](https://tails.boum.org/blueprint/replace_Pidgin/) to find a suitable replacement for Pidgin in the future.
+
+* A discussion about [persistent Tor state](https://tails.boum.org/blueprint/persistent_Tor_state/) has been relaunched.
+
+Press and testimonials
+======================
+
+* 2016-01: Several articles cover the release of Tails 2.0:
+ - 2016-01-27: [Tails 2.0: Das Anonymisierungs-OS im neuen Look](http://www.heise.de/security/meldung/Tails-2-0-Das-Anonymisierungs-OS-im-neuen-Look-3085312.html) by Fabian A. Scherschel in heise (in German).
+ - 2016-01-27: [Edward Snowden's OS of choice gets a major update](http://www.engadget.com/2016/01/27/edward-snowdens-os-of-choice-gets-a-major-update/) by Steve Dent in engadget.
+
+* 2016-01-12: Tails is listed as best distro for privacy in [The Best
+ Linux Distros of 2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/)
+ by Swapnil Bhartiya in Linux.com.
+
+* 2016-01-07: [Tails - Soukromí pro každého - kdekoliv a kdykoliv](http://valeas.cz/it-blog/117-tails-soukromi-pro-kazdeho-kdekoliv-a-kdykoliv) by Václav in Valeas blog (in Czech).
+
+Translation
+===========
+
+Due to the Jessie release, a lot of our translated documentation is now outdated.
+
+All website PO files
+--------------------
+
+ - de: 28% (2236) strings translated, 2% strings fuzzy, 24% words translated
+ - fa: 60% (4855) strings translated, 3% strings fuzzy, 69% words translated
+ - fr: 41% (3301) strings translated, 3% strings fuzzy, 40% words translated
+ - pt: 21% (1669) strings translated, 4% strings fuzzy, 19% words translated
+
+Total original words: 86910
+
+[[Core PO files|contribute/l10n_tricks/core_po_files.txt]]
+--------------------------------------
+
+ - de: 90% (1202) strings translated, 7% strings fuzzy, 88% words translated
+ - fa: 83% (1109) strings translated, 11% strings fuzzy, 76% words translated
+ - fr: 84% (1125) strings translated, 9% strings fuzzy, 79% words translated
+ - pt: 73% (982) strings translated, 16% strings fuzzy, 70% words translated
+
+Total original words: 14326
+
+Metrics
+=======
+
+* Tails has been started more than 571,109 times this month. This makes 18,423 boots a day on average.
+* 39,080 downloads of the OpenPGP signature of Tails ISO from our website.
+* 184 bug reports were received through WhisperBack.
diff --git a/wiki/src/blueprint/monthly_report/report_2016_02.mdwn b/wiki/src/blueprint/monthly_report/report_2016_02.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_02.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_03.mdwn b/wiki/src/blueprint/monthly_report/report_2016_03.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_03.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_04.mdwn b/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_05.mdwn b/wiki/src/blueprint/monthly_report/report_2016_05.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_05.mdwn
diff --git a/wiki/src/blueprint/network_connection.mdwn b/wiki/src/blueprint/network_connection.mdwn
index 90bc8ca..3f2b055 100644
--- a/wiki/src/blueprint/network_connection.mdwn
+++ b/wiki/src/blueprint/network_connection.mdwn
@@ -71,6 +71,11 @@ Open questions
- Lunar's proposal: as a detached windows
- other possibility: invisible browser by default, can be displayed again somehow
+ - Do we want to tell people about entry guards? For example, feedback
+ the entry guard to be selected before connecting? Random entry
+ guards are bad for security but persistent entry guards can ease
+ tracking.
+
Related work
============
diff --git a/wiki/src/blueprint/persistent_Tor_state.mdwn b/wiki/src/blueprint/persistent_Tor_state.mdwn
index b08337d..26e6f23 100644
--- a/wiki/src/blueprint/persistent_Tor_state.mdwn
+++ b/wiki/src/blueprint/persistent_Tor_state.mdwn
@@ -214,6 +214,12 @@ less fingerprintable.
from the mere fact that they are re-using the same Entry Guard in
the place?
**FIXME** do we want to use a HMAC instead?
+ **FIXME** Patrick Schleizer wrote "I find it unlikely, that users
+ might judge an often changing SSID malicious.
+ FreeWifi832458252823523 vs FreeWifi358235892435. How many users are
+ going to remember that? I would guess, they would just click through
+ whatever hoops required to make the WiFi connect again."; what do we
+ think about it?
* `tordate` remains unchanged for now
* Add a NetworkManager hook that generates a random per-Tails device
secret, and stores it into persistence, if the Tor state persistence
diff --git a/wiki/src/blueprint/replace_Pidgin.mdwn b/wiki/src/blueprint/replace_Pidgin.mdwn
index 0aa416d..12681a6 100644
--- a/wiki/src/blueprint/replace_Pidgin.mdwn
+++ b/wiki/src/blueprint/replace_Pidgin.mdwn
@@ -15,6 +15,19 @@ TODO: Would a pair of two separate client (XMPP and IRC) also be okay, or are we
## General requirements
+### Use cases
+
+The client SHOULD support the following use cases:
+
+1. Contributing to Free Software projects that use IRC chatrooms (and won't switch to anything else any time soon)
+2. Contributing to Free Software projects that use XMPP chatrooms
+3. One-to-one chat that is compatible with currently widespread practice. That basically means XMPP + OTR, nowadays.
+4. Participation in public chatrooms for Tails user support.
+
+The client MAY support the following use cases:
+
+* One-to-one chat that protects metadata end-to-end (that is: "who is chatting with whom")
+
### Documentation
### Internationalization
diff --git a/wiki/src/blueprint/report_2015_09.mdwn b/wiki/src/blueprint/report_2015_09.mdwn
deleted file mode 100644
index 246813a..0000000
--- a/wiki/src/blueprint/report_2015_09.mdwn
+++ /dev/null
@@ -1,96 +0,0 @@
-[[!meta title="Tails report for September, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.6 was released on September 22, 2015|news/version_1.6]] (minor release).
-
-* The next release (1.7) is [[planned for November 11|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more that in April.
- - at the beginning of September: 191
- - at the end of September: 185 (FIXME: ask the developers why if
- needed, after checking the SponsorR and SponsorS reports)
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-There will be a Tails and Tor workshop to the [Capitole du libre](https://2015.capitoledulibre.org) in Toulouse (France) on November 22nd.
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-* 2015-09-24: [Open Source Privacy: Tails OS Issues Security Fixes and New Release](http://thevarguy.com/open-source-application-software-companies/092415/open-source-privacy-tails-os-issues-security-fixes-and-ne) by Christopher Tozzi on The VAR Guy.
-
-Translation
-===========
-
-FIXME
-
-At the end of the month:
-
-All website PO files
-
- - de: 19% (1283) strings translated, 0% strings fuzzy, 18% words translated
- - fr: 46% (3120) strings translated, 2% strings fuzzy, 43% words translated
- - pt: 27% (1863) strings translated, 3% strings fuzzy, 26% words translated
-
-Total original words: 76959
-
-[[Core PO files|contribute/l10n_tricks/core_po_files.txt]]
-
- - de: 60% (803) strings translated, 0% strings fuzzy, 68% words translated
- - fr: 92% (1214) strings translated, 3% strings fuzzy, 92% words translated
- - pt: 84% (1119) strings translated, 8% strings fuzzy, 87% words translated
-
-Total original words: 14258
-
-Metrics
-=======
-
-* Tails has been started more than 473.295 times this month. This makes 15.776 boots a day on average.
-
-* 29.135 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_10.mdwn b/wiki/src/blueprint/report_2015_10.mdwn
deleted file mode 100644
index f8c5f7f..0000000
--- a/wiki/src/blueprint/report_2015_10.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-[[!meta title="Tails report for October, 2015"]]
-
-FIXME Edito
-
-No release this month. The next release (1.7) is [[planned for November 11|https://tails.boum.org/contribute/calendar/]].
-
-[[!toc]]
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-There will be a Tails and Tor workshop to the [Capitole du libre](https://2015.capitoledulibre.org) in Toulouse (France) on November 22nd.
-
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-2015-10-05: [Be completely anonymous online](http://www.postandcourier.com/article/20151005/PC05/151009881/1002/be-completely-anonymous-online) by Kim Komando in The Post and Courier.
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 500,551 times this month. This makes 16,147 boots a day on average.
-
-* 25,790 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_11.mdwn b/wiki/src/blueprint/report_2015_11.mdwn
deleted file mode 100644
index 109b036..0000000
--- a/wiki/src/blueprint/report_2015_11.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta title="Tails report for November, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.7 was released on November 11, 2015|news/version_1.7]] (major release).
-
-* The next release (1.8) is [[planned for December 15|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 540,362 times this month. This makes 18,012 boots a day on average.
-
-* 34,881 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_12.mdwn b/wiki/src/blueprint/report_2015_12.mdwn
deleted file mode 100644
index d65850f..0000000
--- a/wiki/src/blueprint/report_2015_12.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta title="Tails report for December, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.8 was released on December 15, 2015|news/version_1.8]] (minor release).
-
-* The next release (2.0) is [[planned for January 26|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 546366 times this month. This makes 17625 boots a day on average.
-
-* 35853 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/website_homepage.mdwn b/wiki/src/blueprint/website_homepage.mdwn
index 67cf19c..b0ea127 100644
--- a/wiki/src/blueprint/website_homepage.mdwn
+++ b/wiki/src/blueprint/website_homepage.mdwn
@@ -23,7 +23,7 @@ Notes taken during the Summit 2014.
- Key tools
- Encrypted storage and configuration (only when you want it) : persistence
- Secure instant messaging : Pidgin + OTR
- - Encrypted emails : Claws + GPG
+ - Encrypted emails : Icedove + GPG
- Anonymous browsing : Torbrowser
- Censorship circumvention
- Windows camouflage
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index af492d4..9a9db9e 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -505,10 +505,6 @@ msgid ""
msgstr "[[Treffen|contribute/meetings]] und Protokolle vergangener Treffen"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index 2b5b789..7857d96 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -490,10 +490,6 @@ msgid ""
msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr "[[contribute/Low-hanging_fruit_sessions]]"
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
@@ -541,3 +537,6 @@ msgstr "با ما تماس بگیرید\n"
#, no-wrap
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.fr.po b/wiki/src/contribute.fr.po
index e985122..148a353 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -459,10 +459,6 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index ab60d7d..a227496 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -168,7 +168,6 @@ Collective process
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- [[Code of conduct|contribute/working_together/code_of_conduct]]
- [[Contributors meetings|contribute/meetings]], and minutes from past meetings
- - [[contribute/Low-hanging_fruit_sessions]]
- [[Marking a task as easy|contribute/working_together/criteria_for_easy_tasks]]
- [[Document progress|contribute/working_together/document_progress]]
- Roles
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 92b5bd5..18ecc3e 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-05-23 14:56-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -508,10 +508,6 @@ msgid ""
msgstr "[[Reuniões|contribute/meetings]], e notas de reuniões passadas"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute/APT_repository.mdwn b/wiki/src/contribute/APT_repository.mdwn
index 0a278da..bc63e29 100644
--- a/wiki/src/contribute/APT_repository.mdwn
+++ b/wiki/src/contribute/APT_repository.mdwn
@@ -204,26 +204,26 @@ operation must be done on the APT suites.
1. Set some environment variables:
- # the branch you want to merge
- SRC=stable
- # the branch you want to merge _into_
- DST=devel
+ # the branch you want to merge
+ SRC=stable
+ # the branch you want to merge _into_
+ DST=devel
2. Merge in Git and APT:
- git checkout "$DST" && \
- git merge "$SRC" && \
- ssh reprepro@incoming.deb.tails.boum.org \
- tails-merge-suite "$SRC" "$DST"
+ git checkout "$DST" && \
+ git merge "$SRC" && \
+ ssh reprepro@incoming.deb.tails.boum.org \
+ tails-merge-suite "$SRC" "$DST"
3. Restore the `config/base_branch` if needed:
- echo "${DST}" > config/base_branch && \
- git commit config/base_branch -m "Restore ${DST}'s base branch." || :
+ echo "${DST}" > config/base_branch && \
+ git commit config/base_branch -m "Restore ${DST}'s base branch." || :
4. Push:
- git push origin "${DST}:${DST}"
+ git push origin "${DST}:${DST}"
4. Make sure not to re-add, into the branch we merge into, any package
that was removed from it, but still is in the branch we merge from:
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index 944c0c1..19cba86 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -96,6 +96,22 @@ Debian Wheezy and Jessie:
sudo rm /etc/apt/sources.list.d/20141010T042049Z.list
sudo apt-get update
+If you run Virtualbox >4.3 (5.0 is in Jessie backports at the moment)
+you will have to patch Vagrant a bit:
+
+ --- /usr/share/vagrant/plugins/providers/virtualbox/driver/meta.rb.orig 2016-02-12 11:58:06.150337645 +0100
+ +++ /usr/share/vagrant/plugins/providers/virtualbox/driver/meta.rb 2016-02-12 11:58:38.778726368 +0100
+ @@ -45,7 +45,8 @@
+ "4.0" => Version_4_0,
+ "4.1" => Version_4_1,
+ "4.2" => Version_4_2,
+ - "4.3" => Version_4_3
+ + "4.3" => Version_4_3,
+ + "5.0" => Version_4_3
+ }
+
+ if @version.start_with?("4.2.14")
+
## Building Tails using Vagrant
Once all dependencies are installed, get the Tails sources and
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 0b49f7c..2cf99d2 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,31 +1,17 @@
[[!meta title="Calendar"]]
-* 2016-01-11:
- - Build and upload Tails 2.0~rc1.
- - Start testing Tails 2.0~rc1 during late CET if building the image
- went smoothly.
+* 2016-03-08: Release 2.2
-* 2016-01-12:
- - Finish testing Tails 2.0~rc1 by the afternoon, CET.
- - Release Tails 2.0~rc1.
+* 2016-04-19: Release 2.3
-* 2016-01-25:
- - The upcoming Tor Browser is hopefully out so we can import it.
- - Build and upload Tails 2.0 ISO image and IUKs.
- - Start testing Tails 2.0 during late CET if building the image
- went smoothly.
+* 2016-06-07: Release 2.4 (Firefox 45.2)
-* 2016-01-26:
- - Finish testing Tails 2.0 by the afternoon, CET.
- - Release Tails 2.0 during late CET, earliest when Mozilla
- publishes their MFSAs.
+* 2016-08-02: Release 2.5 (Firefox 45.3)
-* 2016-03-08 (?): Release 2.2
+* 2016-09-13: Release 2.6 (Firefox 45.4)
-* 2016-04-19 (?): Release 2.3
+* 2016-11-08: Release 2.7 (Firefox 45.5)
-* 2016-05-31 (?): Release 2.4
+* 2016-12-13: Release 2.8 (Firefox 45.5.1)
-* 2016-07-12 (?): Release 2.5
-
-* 2016-08-23 (?): Release 2.6
+* 2017-01-24: Release 2.9 (Firefox 45.6)
diff --git a/wiki/src/contribute/chat.mdwn b/wiki/src/contribute/chat.mdwn
index bbc3099..71ed65e 100644
--- a/wiki/src/contribute/chat.mdwn
+++ b/wiki/src/contribute/chat.mdwn
@@ -1,15 +1,15 @@
-[[!meta title="Development chat"]]
+[[!meta title="Contributors chat"]]
In addition to the [[#tails general chatroom|support/chat]],
-we have a dedicated chatroom for development.
+we have a dedicated chatroom for contributors.
-To join it, use your preferred instant messaging client, e.g.
+To join it, use your preferred instant messaging client that supports XMPP, e.g.
[[Pidgin|http://www.pidgin.im/]], which runs on Windows, GNU/Linux and
Mac OS X.
Here are the needed technical details:
-* server: `irc.oftc.net`
-* port: `6697`
-* channel: `#tails-dev`
+* protocol: XMPP
+* server: `conference.riseup.net`
+* channel: `tails-dev`
* Use TLS/SSL to connect!
diff --git a/wiki/src/contribute/design/I2P_Browser.mdwn b/wiki/src/contribute/design/I2P_Browser.mdwn
index 55db06f..033d743 100644
--- a/wiki/src/contribute/design/I2P_Browser.mdwn
+++ b/wiki/src/contribute/design/I2P_Browser.mdwn
@@ -55,4 +55,4 @@ Code
* [[!tails_gitweb config/chroot_local-includes/usr/local/lib/tails-shell-library/i2p.sh]]
* [[!tails_gitweb config/chroot_local-includes/usr/share/applications/i2p.desktop.in]]
* [[!tails_gitweb config/chroot_local-includes/lib/live/config/2080-install-i2p]]
-* [[!tails_gitweb_dir config/chroot_local-includes/usr/share/tails/i2p-browser]]
+* [[!tails_gitweb_dir config/chroot_local-includes/usr/share/tails/chroot-browsers/]]
diff --git a/wiki/src/contribute/design/Tor_enforcement/DNS.mdwn b/wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
index 911d598..d19a3df 100644
--- a/wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
+++ b/wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
@@ -28,7 +28,7 @@ not to manage `resolv.conf` at all:
* [[!tails_gitweb config/chroot_local-includes/etc/dhcp/dhclient-enter-hooks.d/disable_make_resolv_conf]]
Since the Tor DNS resolver lacks support for most types of DNS queries
-except "A", [ttdnsd](https://www.torproject.org/ttdnsd/) is also
+except "A", [ttdnsd](https://gitweb.torproject.org/ioerror/ttdnsd.git) is also
running and offers support for all kinds of DNS queries Tor does not
know about. This can be useful for advanced users to do system administration
for example. However, ttdnsd is not used in the default name resolution
@@ -42,5 +42,5 @@ third-party, specifically, the organization or people that run the
recursive DNS resolver ttdnsd is configured to use.
- [[!tails_gitweb config/chroot_local-includes/etc/tor/torrc]]
-- [[!tails_gitweb config/chroot_local-includes/etc/firewall.conf]]
+- [[!tails_gitweb config/chroot_local-includes/etc/ferm/ferm.conf]]
- [[!tails_gitweb config/chroot_local-includes/etc/default/ttdnsd]]
diff --git a/wiki/src/contribute/design/Unsafe_Browser.mdwn b/wiki/src/contribute/design/Unsafe_Browser.mdwn
index e623da6..fc10305 100644
--- a/wiki/src/contribute/design/Unsafe_Browser.mdwn
+++ b/wiki/src/contribute/design/Unsafe_Browser.mdwn
@@ -83,4 +83,4 @@ Code
* [[!tails_gitweb config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh]]
* [[!tails_gitweb config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in]]
* [[!tails_gitweb config/chroot_local-includes/etc/sudoers.d/zzz_unsafe-browser]]
-* [[!tails_gitweb_dir config/chroot_local-includes/usr/share/tails/unsafe-browser]]
+* [[!tails_gitweb_dir config/chroot_local-includes/usr/share/tails/chroot-browsers/]]
diff --git a/wiki/src/contribute/how/debian.mdwn b/wiki/src/contribute/how/debian.mdwn
index f9718df..01969c1 100644
--- a/wiki/src/contribute/how/debian.mdwn
+++ b/wiki/src/contribute/how/debian.mdwn
@@ -20,30 +20,14 @@ relationship with Debian.
Tails|contribute/relationship_with_upstream#debian-bts]].
* Work on our [tickets about Debian
work](https://labs.riseup.net/code/projects/tails/issues?query_id=138).
-* Help maintain backports for Wheezy:
- - [[!debpts debomatic]]
- - [[!debpts i18nspector]]
- - [[!debpts libvirt]]
- - [[!debpts liferea]]
- - [[!debpts monkeysign]]
- - [[!debpts pidgin]]
- - [[!debpts poedit]]
- - [[!debpts qemu]]
- - [[!debpts redmine]]
- - [[!debpts ruby-libvirt]]
- - [[!debpts ruby-passenger]]
- - [[!debpts ruby-rjb]]
- - [[!debpts seahorse-nautilus]]
- - [[!debpts shared-mime-info]]
+* Help maintain backports:
+ - look for "jessie-backports" on [[!tails_gitweb config/chroot_apt/preferences]]
- Xorg stack (at least the foundations and the major drivers)
* Help maintain packages:
- [[!debpts libgsecuredelete]]
- [[!debpts mat]]
- [[!debpts nautilus-wipe]]
- - OTR-related packages ([[!debpts pidgin-otr]], [[!debpts libotr]],
- and more) in the [Debian OTR Team](https://wiki.debian.org/Teams/OTR)
- - anonymity-related packages ([[!debpts torsocks]], [[!debpts
- vidalia]], and more) in the [Debian Anonymity Tools Team](https://wiki.debian.org/Teams/AnonymityTools)
+ - privacy-related packages in the [Debian Privacy Team](https://wiki.debian.org/Teams/PkgPrivacyMaintainers)
* Help with distribution-wide improvements:
- [AppArmor support](https://wiki.debian.org/AppArmor)
diff --git a/wiki/src/contribute/how/donate.de.po b/wiki/src/contribute/how/donate.de.po
index dad7cb5..24183da 100644
--- a/wiki/src/contribute/how/donate.de.po
+++ b/wiki/src/contribute/how/donate.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2015-12-31 13:49+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,6 +104,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.fa.po b/wiki/src/contribute/how/donate.fa.po
index 4b2bcb3..b34bded 100644
--- a/wiki/src/contribute/how/donate.fa.po
+++ b/wiki/src/contribute/how/donate.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+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"
@@ -86,6 +86,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.fr.po b/wiki/src/contribute/how/donate.fr.po
index 65bbe6d..922ec51 100644
--- a/wiki/src/contribute/how/donate.fr.po
+++ b/wiki/src/contribute/how/donate.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2015-03-16 22:03+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -102,6 +102,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.mdwn b/wiki/src/contribute/how/donate.mdwn
index 700abcc..10f10d7 100644
--- a/wiki/src/contribute/how/donate.mdwn
+++ b/wiki/src/contribute/how/donate.mdwn
@@ -29,6 +29,9 @@ Ways to donate
* [Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails.boum.org&title=Tails)
+ * For fundraising related matters, you can write
+ to <tails-fundraising@boum.org>.
+
* If none of these methods suit you, consider [donating
to the Tor Project](https://www.torproject.org/donate/). They do
great work, and also support us financially.
diff --git a/wiki/src/contribute/how/donate.pt.po b/wiki/src/contribute/how/donate.pt.po
index 8db8e5e..b830b4e 100644
--- a/wiki/src/contribute/how/donate.pt.po
+++ b/wiki/src/contribute/how/donate.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2014-09-15 12:30-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,6 +96,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn
index cf504dc..55f46d4 100644
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -50,6 +50,7 @@ the rest of the website.
Currently, there are three active **language teams**:
+* [[Farsi|translate/team/fa]]
* [[French|translate/team/fr]]
* [[German|translate/team/de]]
* [[Portuguese|translate/team/pt]]
diff --git a/wiki/src/contribute/how/translate/team/fa.mdwn b/wiki/src/contribute/how/translate/team/fa.mdwn
new file mode 100644
index 0000000..8ed6d2d
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/fa.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="Translate Tails into Farsi"]]
+
+The Farsi translation team uses its [[own mailing
+list|https://mailman.boum.org/listinfo/tails-l10n-fa/]].
diff --git a/wiki/src/contribute/l10n_tricks/core_po_files.txt b/wiki/src/contribute/l10n_tricks/core_po_files.txt
index 8bfc4a1..bd8d4ff 100644
--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
@@ -49,5 +49,7 @@
./download
./getting_started
./index
+./install
./sidebar
./support
+./upgrade
diff --git a/wiki/src/contribute/low-hanging_fruit_sessions.mdwn b/wiki/src/contribute/low-hanging_fruit_sessions.mdwn
deleted file mode 100644
index a3b780c..0000000
--- a/wiki/src/contribute/low-hanging_fruit_sessions.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta title="Low-hanging fruits sessions"]]
-
-Each month a low-hanging fruits session is organized. During these
-sessions, we spend some time together working on many small tasks that take less
-than two hours each.
-
-It currently happens on **twelfth day** of the month on
-[[#tails-dev|contribute/chat]] at 9pm CEST or CET (7pm or 8pm UTC).
-Everybody is welcome to attend, existing contributors and those who
-want to become one.
-
-The goals are to:
-
-* Bypass the somewhat cumbersome paperwork of the usual email-based
- [[review and merge process|contribute/merge_policy]]: during
- low-hanging fruits sessions, we exceptionally allow ourselves to go
- through it live on IRC.
-* Enjoy doing non-urgent things and have some fun together.
-* Get a lot of small improvements into the next Tails release.
-* Cleanup our todo list a bit.
-* Try to handle bug fixes for the next release that are not assigned to
- anybody.
diff --git a/wiki/src/contribute/meetings.mdwn b/wiki/src/contribute/meetings.mdwn
index 4ed8132..1fa9529 100644
--- a/wiki/src/contribute/meetings.mdwn
+++ b/wiki/src/contribute/meetings.mdwn
@@ -3,7 +3,7 @@
[[!toc]]
Each month a contributors meeting is organized. It currently happens
-on **third day** of the month on [[#tails-dev|contribute/chat]] at
+on **third day** of the month on the [[tails-dev chatroom|contribute/chat]] at
9pm CEST or CET (7pm or 8pm UTC). Everybody is welcome to attend, existing
contributors and those who want to become one.
@@ -22,10 +22,8 @@ yourself during the meeting, and be sure to tell us what you are
interested in.
The meeting might not be the most adequate time and place to properly
-introduce newcomers to the development process
-([[contribute/low-hanging_fruit_sessions]] are more appropriate), but
-at least it should be a fine place to know each others, and schedule
-a better suited event.
+introduce newcomers to the development process, but at least it should
+be a fine place to know each others, and schedule a better suited event.
# Instructions for taking notes
diff --git a/wiki/src/contribute/meetings/201602.mdwn b/wiki/src/contribute/meetings/201602.mdwn
new file mode 100644
index 0000000..fb292e5
--- /dev/null
+++ b/wiki/src/contribute/meetings/201602.mdwn
@@ -0,0 +1,62 @@
+[[!meta title="February 2016 online meeting"]]
+
+[[!toc levels=1]]
+
+# Introduction
+
+We do a bit more free form and skip topics for which people not here today
+have a strong opinion (or might have one), because we're mostly new contributors.
+So we skip "Hole in the roof" which are hard and boring.
+
+# Important tickets flagged for next release but without assignee
+
+ - [[!tails_ticket 11048 desc="Permanently remove the rest of the keyboard layout"]] and
+ [[!tails_ticket 11044 desc="PXE Boot support"]] not triaged yet
+
+ - segfault will look at
+ [[!tails_ticket 11031 desc="Open URL feature of KeepassX doesn't work anymore"]] which
+ seems to be fixed by installing gnome-open
+
+ - [[!tails_ticket 10765 desc="Allow pinning certificates in Icedove"]] will be postponed,
+ as it is a new feature (no bugfix, no regression, etc.) and noone present wants to dig
+ into it at the moment
+
+ - [[!tails_ticket 7496 desc="Make it possible to verify the integrity of a device created
+ by Tails Installer"]] segfault will write a mail to the list about this, we leave the
+ ticket open for the rms
+
+ - [[!tails_ticket 11000 desc="The Tor Browser's font fingerprinting protection does not
+ work in Tails" is already "Fix committed"
+
+ - [[!tails_ticket 9844]] didn't find an assignee
+ - For [[!tails_ticket 9949 desc="Audit AppArmor policy vs. hard links"]],
+ intrigeri who has followed it has been pinged for status or ETA update.
+
+# Availability and plans until the next meeting
+
+ - sycamore will write down some stuff about entropy
+ - muri is still working on the l10 screenshot automation
+ - muri also plans to take another look at weblate
+ - spriver would like to start to translate the installation assistant
+ - segfault wants to rethink the installation and upgrade process
+
+
+# [[!tails_ticket 9555 desc="Include a pinentry GUI that's well integrated within GNOME"]]
+
+upgrading pinentry-gtk2 from 0.8.3-2 to 0.9.7-1 improves things and using pinentry-gnome3
+would make things worse, at least for keepassx users. segfault will submit a branch that
+upgrades pinentry-gtk2 to 0.9.7-1
+
+# [[!tails_ticket 10913 desc="Keyboard layout keyboard shortcut has changed"]]
+
+Right-now there as three keyboard shortcuts to change keyboard layout:
+
+ - Super+Space which is provided by GNOME.
+ - Shift+Shift which is custom to Tails (added in e492749). segfault
+ will see whether we should get rid of this one as well.
+ - Alt+Shift which is custom to Tails (added in 370f48c). Saying that
+ this is the default in Windows might have been an ok argument at some point.
+
+Seeing that [[!tails_ticket 11042 desc="alt + shift switch the keyboard layout
+without indicating it in the keyboard layout menu"]], GNOME is giving it a different meaning
+by default: Alt+Shift shortcut will be removed. segfault will submit a branch.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 09302c7..39a4b30 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -181,6 +181,7 @@ the release branch's APT suite:
* [[perl5lib]]
* [[persistence-setup]]
* [[tails-iuk]]
+* [[tor]]
* whisperback:
* follow [upstream release process](https://git-tails.immerda.ch/whisperback/plain/HACKING)
* build a Debian package
@@ -236,10 +237,25 @@ Update other base branches
1. Merge the release branch into `devel` following the instructions for
[[merging base branches|contribute/APT_repository#workflow-merge-main-branch]].
-2. Push the modified branches to Git:
+2. Merge `devel` into `feature/jessie` following the instructions for
+ [[merging base branches|contribute/APT_repository#workflow-merge-main-branch]].
+ Given that these two branches' APT suites have diverged a lot, and
+ that `tails-merge-suite` currently happily overwrites newer
+ packages in the target with older packages from the source, it's
+ probably easier to just merge each individual APT overlay that was
+ just merged into the release branch into `feature/jessie`'s APT
+ suite. Also, most of our just upgraded bundled packages
+ (e.g. `tails-greeter`) may need to be rebuilt for Jessie.
+
+3. Ensure that the release, `devel` and `feature/jessie` branches
+ have the expected content in `config/APT_overlays.d/`: e.g. it must
+ not list any overlay APT suite that has been merged already.
+
+4. Push the modified branches to Git:
git push origin "${RELEASE_BRANCH}:${RELEASE_BRANCH}" \
- devel:devel
+ devel:devel \
+ feature/jessie:feature/jessie
Update more included files
==========================
@@ -250,6 +266,7 @@ Changelog
Remove the placeholder entry for next release in `debian/changelog`,
and then:
+ git checkout "$RELEASE_BRANCH" && \
./release $VERSION $PREVIOUS_VERSION
This populates the Changelog with the Git log entries.
@@ -460,8 +477,6 @@ suite should be ready, so it is time to:
git checkout "${RELEASE_BRANCH}"
-<a id="prepare-iuk"></a>
-
Generate the OpenPGP signatures and Torrents
============================================
@@ -499,6 +514,8 @@ Fifth, generate detached OpenPGP signatures for every published
tails-i386-$VERSION.torrent && \
mv tails-i386-$VERSION.torrent.{asc,sig}
+<a id="prepare-iuk"></a>
+
Prepare incremental upgrades
============================
@@ -625,8 +642,6 @@ Prepare upgrade-description files
Prepare the ISO description file for DAVE
-----------------------------------------
-Skip this section if preparing a release candidate.
-
Update the ISO description file (IDF) used by the browser extension:
ISO_PATH="${ISOS}/tails-i386-${VERSION}/tails-i386-${VERSION}.iso"
@@ -770,9 +785,9 @@ to be released in `inc/*`:
Update the size of the ISO image in `inc/*`:
- LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
- cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' > \
- "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
+ LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
+ cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' \
+ > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
Generate the expected signature verification output:
@@ -1006,7 +1021,8 @@ Prepare for the next release
XXX: adapt / fork for release candidates. In the meantime, read all
this, and skip what does not make sense for a RC.
-1. Move the previous stable release to `obsolete` on the mirrors.
+1. If you just released a new stable release, remove the previous
+ stable release on the mirrors.
1. Remove any remaining RC for the just-published release from
the mirrors.
1. Remove IUKs that are more than 6 months old from
@@ -1041,45 +1057,39 @@ this, and skip what does not make sense for a RC.
--repo "$bare_repo" && \
rm -rf "$bare_repo"
+1. Remove all old versions in `wiki/src/upgrade/v1/Tails` that were
+ never released. Explanation: the post-release APT repository steps
+ from the previous stable release will usually have had us prepare
+ for an emergency release that was never made.
1. Pull `master` back and merge it into `stable`, and in turn into
- `devel` and `experimental`.
+ `devel`, `experimental` and `feature/jessie`.
1. Follow the
[[post-release|contribute/APT_repository#workflow-post-release]] APT
- repository documentation.
+ repository documentation. Make sure there are upgrade-description
+ files for any new versions that were added.
1. Push the resulting branches.
1. If this was a major release, then reset experimental:
+ - take note of branches merged into `experimental`, but not into
+ `devel`:
+
+ git log --pretty=oneline --color=never --merges devel..experimental \
+ | /bin/grep 'into experimental$' \
+ | sed -e 's,^[a-f0-9]\+\s\+,,' | sort -u
+
+ - `git checkout experimental && git reset --hard devel`
+ - merge additional Git branches into experimental
- EXPERIMENTAL_BRANCHES="$(
- git log --pretty=oneline --color=never --merges origin/devel..origin/experimental |
- sed -n -E "s,^[a-f0-9]+ Merge( remote-tracking)? branch '(origin/)?([^']+)' into experimental$,origin/\3,p" |
- grep -v -E '^origin/(master|stable|testing|devel|experimental)$' |
- sort -u
- )" && \
- git checkout experimental && \
- git reset --hard origin/devel && \
- for branch in ${EXPERIMENTAL_BRANCHES} ; do
- if [ -z "$(git diff experimental...${branch})" ]; then
- echo "Skipping branch '${branch}' due to empty diff"
- continue
- fi
- echo "Merging branch '${branch}' ..."
- git merge --no-edit "${branch}" || (
- echo "Please resolve the problem in another terminal (including committing in case of a conflict resolution)"
- read -p "Press ENTER to continue! "
- )
- done && \
- git push --force origin experimental:experimental
+ for branch in $UNMERGED_BRANCHES ; do
+ git merge $branch
+ done
+ - `git push --force origin experimental:experimental`
1. Make sure Jenkins manages to build all updated major branches fine:
<https://jenkins.tails.boum.org/>.
1. Delete the _Release Manager View for $VERSION_ Redmine custom query.
1. Ensure the next few releases have their own _Release Manager View_.
1. On the [[!tails_roadmap]], update the *Due date* for the *Holes
in the Roof* so that this section appears after the next release.
-1. If the next release is a point-release, ask
- <tails-sysadmins@boum.org> to disable the Jenkins job that's
- building ISO images from the `testing` branch (since it basically
- won't be used/maintained in the next 2.5 months).
1. If you will be the release manager for the next release, look at the
tasks that must be done at the beginning of your shift in the
[[release manager role page|contribute/working_together/roles/release_manager]].
diff --git a/wiki/src/contribute/release_process/liveusb-creator.mdwn b/wiki/src/contribute/release_process/liveusb-creator.mdwn
index 8acfa0a..63c7554 100644
--- a/wiki/src/contribute/release_process/liveusb-creator.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator.mdwn
@@ -1,2 +1,3 @@
See [[contribute/release_process/tails-installer]].
+
diff --git a/wiki/src/contribute/release_process/tails-installer.mdwn b/wiki/src/contribute/release_process/tails-installer.mdwn
index 03af60b..c067c1d 100644
--- a/wiki/src/contribute/release_process/tails-installer.mdwn
+++ b/wiki/src/contribute/release_process/tails-installer.mdwn
@@ -63,6 +63,11 @@ targeted at current Tails, as said above. More specifically:
* The `upstream/3.x+dfsg`, `upstream/4.x+dfsg`, etc. branches are what we tell `gbp`
to use as its "upstream" branch. Make sure to check them out when setting up the repository
for the first time.
+* For Ubuntu, we want to support the current Ubuntu version (currently `wily`), the
+ upcoming version, currently (`xenial`) and the current LTS, from 16.04 on (currently
+ `xenial`).
+ We do not maintain any Git branches related to Ubuntu releases, as simply the changelog
+ entries are modified.
Topic branches
--------------
@@ -225,7 +230,49 @@ Example for a backport to Jessie:
* have gbp create a `debian/4.3+dfsg-1_bpo8+1` tag
* push the Debian packaging branch (`debian/jessie-backports`) and the new tag
-### Quality assurance
+Upload a package to our Ubuntu PPA
+----------------------------------
+
+Team members are allowed to upload a package to our Ubuntu PPA:
+<https://launchpad.net/~tails-team/+archive/ubuntu/tails-installer>
+
+You'll need to configure the dput tool to upload to the PPA and put into
+`$HOME/.dput.cf` (adjust to use your Launchpad ID):
+
+ [ppa-tails-installer]
+ fqdn = ppa.launchpad.net
+ method = sftp
+ incoming = ~tails-team/ubuntu/tails-installer/
+ login = your_launchpad_id
+ allow_unsigned_uploads = 0
+
+* checkout the `debian/sid` branch
+ to build a package for the next Ubuntu release or checkout the
+ `debian/jessie-backports` branch to build a package for the
+ current Ubuntu version or current LTS.
+* bump version to `4.3+dfsg-0ubuntu1~$codename` using `dch -i`
+ where `$codename` is the name of the target Ubuntu distribution.
+* if it does not exist, rebuild the .orig.tar.gz of the latest version
+ from pristine-tar (use the latest git log entry to find the version):
+ `pristine-tar checkout ../tails-installer_4.4.6+dfsg.orig.tar.gz`
+* build a source only package using `debuild -i -uc -us -sa -S`
+ Once the package has been built, a `.changes` file will be created in
+ pbuilder's configured destination directory.
+* test the package (piuparts, Lintian, etc.)
+* sign the corresponding source.changes file
+ `debsign ../tails-installer_$NEW_UPSTREAM_RELEASE-xxx_source.changes`
+ Replace "xxx" with the correct version information.
+ The signature should be made with a key which is registered
+ at Launchpad as being part of the Tails team.
+* Upload to the PPA:
+ `dput ppa-tails-installer ../tails-installer_$NEW_UPSTREAM_RELEASE+xxx_source.changes`
+
+You will receive an email informing you if the upload was really successful
+or if it contained any errors. On success, you should now revert your changes on the
+Debian branch using `git reset HEAD --hard`.
+
+Quality assurance for Debian and Ubuntu packages
+------------------------------------------------
Scenario: Installing Tails to a pristine USB drive
Given I have started Debian
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 6759d9e..289dc9c 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -91,6 +91,22 @@ the corresponding tarballs ourselves, so read on the next section.
</p>
</div>
+Sync with the start-tor-browser script
+======================================
+
+Adapt our `config/chroot_local-includes/usr/local/bin/tor-browser`
+and/or
+`config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh`
+for recent changes in `RelativeLink/start-tor-browser` in the
+[Tor Browser Bundle Git repo](https://git.torproject.org/builders/tor-browser-bundle.git). Look
+in the Git history:
+
+ git log -p RelativeLink/start-tor-browser
+
+and take note of changes to environment variables (or newly added
+ones) and the commandline options passed to the `firefox` executable,
+etc.
+
Self-hosted Tor Browser tarballs archive
========================================
@@ -159,10 +175,10 @@ Import a new set of Tor Browser tarballs
Commit and push your changes
----------------------------
- cd "$TORBROWSER_ARCHIVE" && \
+ cd "$TORBROWSER_ARCHIVE" && \
git commit -m "Add Tor Browser ${VERSION}." && \
git annex sync && \
- git annex copy --to origin
+ git annex copy --to origin -- "${VERSION}"
Adjust the URL in the main Git repository
-----------------------------------------
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn
index 5d03df4..d4efafe 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn
@@ -2,18 +2,6 @@
[[!toc levels=2]]
-<div class="caution">
-<strong>Deadline: 2016-01-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 December 2015.
Everything in this report can be made public.
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2016_01.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2016_01.mdwn
new file mode 100644
index 0000000..4aa97ef
--- /dev/null
+++ b/wiki/src/contribute/reports/SponsorS/2015/2016_01.mdwn
@@ -0,0 +1,276 @@
+[[!meta title="Tails January 2016 report"]]
+
+[[!toc levels=2]]
+
+This report covers the activity of Tails in January 2016.
+
+Everything in this report can be made public.
+
+# A. Replace Claws Mail with Icedove
+
+Last month we modified our Icedove schedule quite a bit. Due to
+sickness, some work has been delayed while other tasks have moved
+forward faster than expected.
+
+- A.1.1 Secure the Icedove autoconfig wizard: [[!tails_ticket 6154]]
+
+ The proof-of-concept branch that integrates the secured wizard into
+ Tails is delayed until the end of February and should be released in
+ 2.4 instead.
+
+ We've been evaluating our own patches for Icedove against those
+ reported to Mozilla's bugtracker and are happy to announce that our
+ patches would provide an option to accept only secure protocols, as
+ a user opt-in. These patches will be submitted to Mozilla's bugtracker
+ and hopefully integrated upstream.
+ ([[!tails_ticket 7064]])
+
+- A.1.2 Make our improvements maintainable for future versions of Icedove
+
+ Unfortunately we also discovered that the autoconfig wizard of Icedove does
+ not always use the configured proxy. This means that some traffic can leak.
+ This is not a security problem in Tails since we drop non-Tor
+ traffic by default, but for this very reason it breaks the
+ functionality of the autoconfig wizard in the context of Tails.
+ We started to write a proof-of-concept patch to fix this bug which
+ will be submitted upstream in February.
+
+ We've worked out a set of strong arguments before actually presenting
+ our patches to upstream. We are now ready to do that ([[!tails_ticket 6156]]).
+
+ In order to improve Icedove's security in Tails and avoid unforeseen exploits,
+ we started evaluating an AppArmor profile for Icedove ([[!tails_ticket 10750]]).
+ We've asked the author to submit it upstream where it's now waiting to be merged.
+ In the meantime, we will consider shipping this profile in Tails on our own.
+
+- A.1.4. Provide a migration path for our users from Claws Mail to Icedove
+
+ This was completed in time for the first release of Icedove in Tails 1.8 (December 15).
+
+- A.1.6. Release Icedove in Tails
+
+ Icedove was made the default email client in Tails 1.8 (December 15)
+ and Claws Mail was removed from Tails in version 2.0 (January 26).
+
+# 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 January, **757 ISO images** were automatically built by our Jenkins
+instance.
+
+We worked on designing and implementing a workaround for an issue in our
+autobuild setup: it sometimes happens that a build fails and leaves its
+temporary directories. The subsequent builds happening on the same
+system then always fail as they lack space in the /tmp/ directory.
+([[!tails_ticket 10772]])
+
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
+
+In January, all the **757 ISO images** that were built were also tested by our Jenkins instance.
+
+- B.2.4. Implement and deploy the best solution from this research: [[!tails_ticket 5288]]
+
+ We installed the Jenkins `Cluster Statistics` plugin in order to get a
+ better idea of our Jenkins slaves usage. ([[!tails_ticket 10969]])
+
+ We consider our setup deployed but still needing adjustments:
+
+ - We planned to design a collective way to check regulary for false
+ positives and fragile scenarios, as it has proven to be not that well
+ handled by our team. This is planned to be discussed and implemented at
+ our monthly CI team meeting in February. ([[!tails_ticket 10993]])
+
+ - We still need to investigate a bug we've seen with the usage of the
+ Jenkins Cucumber Test Result plugin that is likely to only have been due
+ to a change we made in our infrastructure at the same moment it was
+ running. ([[!tails_ticket 10725]])
+
+ - We've sometimes seen some of our ISO testing VMs going offline and being
+ unavailable for new jobs. We tried a workaround, but we still need to
+ check if it worked. ([[!tails_ticket 10601]])
+
+## B.3. Extend the coverage of our test suite
+
+- B.3.7. Automatically test behavior on boot medium removal: [[!tails_ticket 5472]]
+
+ This was implemented and merged.
+
+- B.3.11. Fix newly identified issues to make our test suite more robust and faster
+
+ We've marked some more scenarios as fragile, as we noticed there
+ were still some false positives ([[!tails_ticket 10863]]):
+
+ - Encrypting and signing a message using an OpenPGP key ([[!tails_ticket 10991]])
+ - OpenPGP applet key selection window badly handled ([[!tails_ticket 10992]])
+ - Viewing and printing a PDF file ([[!tails_ticket 10994]])
+ - MAC address spoofing ([[!tails_ticket 10774]])
+ - Tails Installer ([[!tails_ticket 10720]])
+
+ The test suite machinery sometimes misses the boot splash
+ ([[!tails_ticket 10777]]): a branch was proposed.
+
+ Some research was done on a bug that we can't reproduce anymore now
+ ([[!tails_ticket 10504]]).
+
+## B.4. Freezable APT repository
+
+This was put aside in January, while the developer responsible for
+this project was focusing on porting Tails to Debian Jessie. Some
+progress was made nevertheless.
+
+- B.4.6. Adjust the rest of our ecosystem to the freezable APT repository: [[!tails_ticket 6303]]
+
+ We completed our evaluation of the hardware resources required by
+ our draft design ([[!tails_ticket 6295]]), purchased and set up the
+ needed storage ([[!tails_ticket 10851]]). Next step on this front is
+ to adjust our backup system, and our fail-over system once we
+ have one.
+
+# C. Scale our infrastructure
+
+## C.2. Be able to detect within hours failures and malfunction on our services
+
+Deciding on how to deploy new hosts in our current Puppet setup took a bit
+more time than planned. A solution has been proposed, and once agreed upon, it
+will be deployed in production, which should happen in the beginning of
+February.
+
+Once this is done, we'll be able to start the deployment of the
+monitoring software on the new host, and implement the first critical
+checks. That has already been tested in the prototype. This will happen
+during February.
+
+Implementing other checks is planned for the end of February and
+beginning of March, as well as starting the setup of notifications to
+our sysadmins. In the end, we'll spend most of the rest of March and
+beginning of April to refine our setup, mostly on the notification part.
+This should lead us toward the completion of the whole C.2 deliverable
+before M5 is over.
+
+- C.2.1. Research and decide what monitoring solution to use
+ what tools and abstraction layer to use for configuring it,
+ and where to host it: [[!tails_ticket 8645]]
+
+ We decided to use Icinga 2 that seems to fit our specifications best.
+ It will be installed on a dedicated virtual machine hosted in
+ a different data center than all the services it will monitor.
+
+ Our prototype (see C.2.2) helped us validate this choice against our
+ requirements.
+
+- C.2.2. Set up the monitoring software and the underlying infrastructure
+
+ We deployed a prototype and are now waiting for the final host to be
+ configured to put it into production.
+
+- C.2.4. Configure and debug the monitoring of the most critical services: [[!tails_ticket 8650]]
+
+ Our prototype is already set up to monitor all the checks that we ranked as
+ critical in our blueprint.
+
+- C.2.5. Configure the receiving side of the monitoring notifications: [[!tails_ticket 8651]]
+
+ During the discussion about which services to check, we
+ defined our needs concerning notifications. This will be handled
+ after the monitoring software is deployed on the production host.
+
+- C.2.6. Configure and debug the monitoring of other high-priority services: [[!tails_ticket 8653]]
+
+ Some of these checks are already integrated in the default setup of the
+ monitoring software or part of the basics checks already handled and
+ easy to setup. Some have been tested on the prototype.
+
+## C.4. Maintain our already existing services
+
+We kept on answering the requests from the community as well as taking
+care of security updates as covered by "C.4.4. Administer our services
+up to milestone IV" and "C.4.5. Administer our services up to milestone
+V" until the end of January.
+
+We proposed a design to administer our new monitoring machine with Puppet
+([[!tails_ticket 10760]]).
+
+We fixed a bug in our Puppet manifests that prevented us to deploy
+new ISO tester systems. We improved the toolbox we use to compute
+statistics about the load put on our Jenkins workers, and
+their performance.
+
+# D. Migration to Debian Jessie
+
+- D.1.1. Adjust to the change of desktop environment to GNOME Shell
+
+ This was completed back in November 2015.
+
+- D.3.1 Update our test suite for Tails Jessie
+
+ This was completed ([[!tails_ticket 7563]]).
+
+ The only remaining issues are a few robustness ones, such as
+ [[!tails_ticket 10900]]. They will be handled as part of the "B.3.11.
+ Fix newly identified issues to make our test suite more robust and
+ faster" deliverable.
+
+- D.4.1 Document the changes implied by the move to Jessie on our website
+
+ We adapted all of our user documentation to Jessie ([[!tails_ticket 7584]]). For example we
+ entirely rewrote the [[introduction to
+ GNOME|doc/first_steps/introduction_to_gnome_and_the_tails_desktop]] and the
+ [[documentation on encrypted partitions|doc/encryption_and_privacy/encrypted_volumes]].
+
+ While reworking these pages we simplified and improved some of
+ the oldest parts of our documentation. This process also involved new
+ contributors who wrote documentation for Tails for the first time.
+
+- D.5.1 Release an official version of Tails based on Jessie
+
+ We put out a [[release candidate|news/test_2.0-rc1]], that allowed us to
+ identify and resolve quite a few bugs, such as
+ [[!tails_ticket 10862]], [[!tails_ticket 10809]], and
+ [[!tails_ticket 10784]]. We will be writing regression tests for some
+ of these bugs, in particular the persistence -related ones
+ ([[!tails_ticket 10834]] and [[!tails_ticket 10840]]).
+
+ Tails 2.0 [[was released|news/version_2.0]] on January 26, as planned.
+
+# E. Release management
+
+- [[Tails 2.0|news/version_2.0]] was released on 2016-01-26:
+
+ - Tails now uses the <span class="application">GNOME Shell</span> desktop
+ environment, in its <span class="application">Classic</span> mode.
+ <span class="application">GNOME Shell</span> provides a modern, simple, and
+ actively developed desktop environment. The <span class="application">Classic</span>
+ mode keeps the traditional <span class="guimenu">Applications</span>,
+ <span class="guimenu">Places</span> menu, and windows list. Accessibility and
+ non-Latin input sources are also better integrated.
+ - Debian 8 upgrades most included software, for example:
+ - Many core GNOME utilities from 3.4 to 3.14:
+ <span class="application">Files</span>,
+ <span class="application">Disks</span>,
+ <span class="application">Videos</span>, etc.
+ - <span class="application">LibreOffice</span> from 3.5 to 4.3
+ - <span class="application">PiTiVi</span> from 0.15 to 0.93
+ - <span class="application">Git</span> from 1.7.10 to 2.1.4
+ - <span class="application">Poedit</span> from 1.5.4 to 1.6.10
+ - <span class="application">Liferea</span> from 1.8.6 to 1.10
+ - Update <span class="application">Tor Browser</span> to 5.5 (based on Firefox 38.6.0 ESR):
+ - Add Japanese support.
+ - Remove the Windows camouflage which is currently broken in GNOME Shell.
+ - Change to `systemd` as init system and use it to:
+ - Sandbox many services using Linux namespaces and make them harder to exploit.
+ - Make the launching of Tor and the memory wipe on shutdown more robust.
+ - Sanitize our code base by replacing many custom scripts.
+ - Update most firmware packages which might improve hardware compatibility.
+ - Notify the user if Tails is running from a non-free virtualization software.
+ - Remove <span class="application">Claws Mail</span>, replaced by
+ <span class="application">[[Icedove|doc/anonymous_internet/icedove]]</span>.
+ - HiDPI displays are better supported. ([[!tails_ticket 8659]])
+ - Remove the option to open a download with an external application in Tor
+ Browser as this is usually impossible due to the AppArmor confinement.
+ ([[!tails_ticket 9285]])
+ - Close <span class="application">Vidalia</span> before restarting Tor.
+ - Allow <span class="application">Videos</span> to access the DVD drive.
+ ([[!tails_ticket 10455]], [[!tails_ticket 9990]])
+ - Allow configuring printers without administration password.
+ ([[!tails_ticket 8443]])
diff --git a/wiki/src/contribute/talk.html b/wiki/src/contribute/talk.html
index 649995e..e1d2d30 100644
--- a/wiki/src/contribute/talk.html
+++ b/wiki/src/contribute/talk.html
@@ -11,8 +11,9 @@
and headers reveal about yourself: location, IP address, etc.
</li>
<li>
- You can join our [[#tails|support/chat]] and
- [[#tails-dev|contribute/chat]] chatrooms; note: only a few
+ You can join our [[#tails|support/chat]] user support IRC chatroom,
+ or the tails-dev XMPP one (server: `conference.riseup.net`)
+ that is meant for discussion among contributors; note: only a few
Tails core developers hang out there, so email
is preferred for anything that might be of
interest for the larger Tails development community.
diff --git a/wiki/src/doc/about.index.de.po b/wiki/src/doc/about.index.de.po
index 60ddab7..6dfcbdb 100644
--- a/wiki/src/doc/about.index.de.po
+++ b/wiki/src/doc/about.index.de.po
@@ -5,15 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-25 22:13+0100\n"
-"PO-Revision-Date: 2014-06-14 20:30-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-02-12 15:03+0100\n"
+"PO-Revision-Date: 2016-02-06 17:33+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.6\n"
#. type: Bullet: ' - '
msgid "[[!traillink System_requirements|about/requirements]]"
@@ -29,7 +30,7 @@ msgstr "[[!traillink Funktionen_und_mitgelieferte_Programme|about/features]]"
#. type: Bullet: ' - '
msgid "[[!traillink Why_does_Tails_use_Tor?|about/tor]]"
-msgstr "[[!traillink Warum_benutzt_Tails_Tor?|about/tor]]"
+msgstr "[[!traillink Wieso_nutzt_Tails_Tor?|about/tor]]"
#. type: Bullet: ' - '
msgid ""
@@ -51,6 +52,8 @@ msgid ""
"[[!traillink Acknowledgments_and_similar_projects|about/"
"acknowledgments_and_similar_projects]]"
msgstr ""
+"[[!traillink Danksagungen_und_ähnliche_Projekte|about/"
+"acknowledgments_and_similar_projects]]"
#. type: Bullet: ' - '
msgid "[[!traillink Finances|about/finances]]"
diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index 1eabf78..4575ea4 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -5,50 +5,38 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-02-11 05:30+0100\n"
+"PO-Revision-Date: 2016-01-29 22:15+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr ""
+"X-Generator: Poedit 1.8.6\n"
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink 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"
msgstr ""
+" - [[!traillink Eine_Netzwerkverbindung_herstellen|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Anmelden_bei_Captive_Portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Tor_mit_<span_class=\"application\">Vidalia</span>_steuern|anonymous_internet/vidalia]]\n"
+" - [[!traillink Mit_dem_<span_class=\"application\">Tor_Browser</span>_im_Internet_surfen|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Mit_Pidgin_&_OTR_chatten|anonymous_internet/pidgin]]\n"
+" - [[!traillink Emails_mit_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
+" - [[!traillink Von_<span_class=\"application\">Claws_Mail</span>_nach_<span_class=\"application\">Icedove</span>_migrieren|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Bitcoins_mit_<span_class=\"application\">Electrum</span>_austauschen|anonymous_internet/electrum]]\n"
+" - [[!traillink I2P_benutzen|anonymous_internet/i2p]]\n"
+" - [[!traillink Wieso_ist_Tor_langsam?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fa.po b/wiki/src/doc/anonymous_internet.index.fa.po
index 51ea311..4d56aa4 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: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\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/"
@@ -19,44 +19,14 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.4-dev\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink ورود_به_پورتال‌های_کپتیو|anonymous_internet/unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
-"span>|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
-"anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -65,6 +35,37 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink ورود_به_پورتال‌های_کپتیو|anonymous_internet/unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
+#~ "anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
+
+#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
#~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#~ msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 1f70ba0..8c178b7 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -16,44 +16,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Se_connecter_au_réseau_avec_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
-"\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
-#, no-wrap
+#, 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"
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -67,6 +43,36 @@ msgstr ""
" - [[!traillink Pourquoi_Tor_est-il_lent_?|anonymous_internet/why_tor_is_slow]]\n"
#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Se_connecter_au_réseau_avec_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
+#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
#~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#~ msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.mdwn b/wiki/src/doc/anonymous_internet.index.mdwn
index 41a3a4e..6cdd527 100644
--- a/wiki/src/doc/anonymous_internet.index.mdwn
+++ b/wiki/src/doc/anonymous_internet.index.mdwn
@@ -1,5 +1,5 @@
- - [[!traillink Connecting_to_the_network_with_NetworkManager|anonymous_internet/networkmanager]]
- - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]
+ - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]
+ - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]
- [[!traillink Controlling_Tor_using_<span_class="application">Vidalia</span>|anonymous_internet/vidalia]]
- [[!traillink Browsing_the_web_with_<span_class="application">Tor_Browser</span>|anonymous_internet/tor_browser]]
- [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index 25651e9..ea1ccab 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: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\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"
@@ -15,49 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</span>|"
-"anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
-#| "tor_browser]]"
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
-"tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -65,6 +30,42 @@ msgid ""
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
+#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
+#~| "tor_browser]]"
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
+#~ "tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
#, fuzzy
#~| msgid ""
#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+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"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
index 628bfc5..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+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"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+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"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
index 63e05d2..7091f5e 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
@@ -2,26 +2,36 @@
[[!inline pages="doc/anonymous_internet/icedove/replacement.inline" raw="yes"]]
-<span class="application">Claws Mail</span> will be definitely removed
+<span class="application">Claws Mail</span> was removed
from Tails in version 2.0 (2016-01-26).
[[!inline pages="doc/anonymous_internet/icedove/name.inline" raw="yes"]]
-If you have been using <span class="application">Claws Mail</span> and activated its persistence feature,
-the following instructions explain how to migrate your data to <span class="application">Icedove</span>.
-
We recommend you do the migration before launching <span class="application">Icedove</span> for the first
time. You should, in this order:
[[!toc]]
+<a id="install"></a>
+
+Install <span class="application">Claws Mail</span>
+===================================================
+
+1. Start Tails and [[set up an administration password|first_steps/startup_options/administration_password]].
+
+1. Choose <span class="menuchoice"><span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Terminal</span></span> to open a terminal.
+
+1. Execute the following command to install <span class="application">Claws Mail</span>:
+
+ sudo apt install claws-mail
+
<a id="mailboxes"></a>
Copy your emails saved in the persistent storage
================================================
-1. Start Tails and [[set up an administration password|first_steps/startup_options/administration_password]].
-
1. Start <span class="application">Claws Mail</span>.
1. To know if you are using the IMAP or the POP protocol, choose <span class="menuchoice">
@@ -39,8 +49,8 @@ Copy your emails saved in the persistent storage
<span class="application">Claws Mail</span> to
<span class="application">Icedove</span>.
-1. Verify that both the <span class="application">Claws Mail</span> and
- <span class="application">Icedove</span> persistence features are
+1. Verify that the
+ <span class="application">Icedove</span> persistence feature is
activated. Otherwise, you might loose data.
1. The script only migrates the mailbox in
@@ -58,11 +68,7 @@ Copy your emails saved in the persistent storage
<span class="application">Claws Mail</span>, please move all your emails into
the one corresponding to <span class="filename">/home/amnesia/.claws-mail/Mail</span>.
-1. Choose <span class="menuchoice"><span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">Terminal</span></span> to open a terminal.
-
-1. Execute the following command to download the migration script:
+1. In the terminal, execute the following command to download the migration script:
wget https://tails.boum.org/misc/claws_to_icedove.sh
@@ -80,7 +86,7 @@ Copy your emails saved in the persistent storage
<li>In <span class="application">Icedove</span>, choose
<span class="menuchoice">
- <span class="guimenu">[[!img icedove/menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
<span class="guimenuitem">Account Settings</span></span>.</li>
@@ -138,7 +144,7 @@ Configure your email accounts in <span class="application">Icedove</span>
1. Choose
<span class="menuchoice">
- <span class="guimenu">[[!img icedove/menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
<span class="guimenuitem">Account Settings</span></span>.
@@ -213,20 +219,19 @@ To do so:
1. Choose <span class="menuchoice">
<span class="guimenu">Places</span>&nbsp;▸
- <span class="guimenuitem">Home Folder</span>
+ <span class="guimenuitem">Home</span>
</span> in the top navigation bar to open the file browser.
1. Choose <span class="menuchoice">
- <span class="guimenu">View</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/go-down.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
<span class="guimenuitem">Show Hidden Files</span></span>.
1. Open the <span class="guilabel">.claws-mail</span> folder.
1. Choose <span class="menuchoice">
- <span class="guimenu">Edit</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
<span class="guimenuitem">Select All</span></span>.
-1. Choose <span class="menuchoice">
- <span class="guimenu">Edit</span>&nbsp;▸
- <span class="guimenuitem">Wipe</span>
- </span> and confirm.
+1. Right-click, choose <span class="menuchoice">
+ <span class="guimenuitem">Wipe</span></span>,
+ and confirm.
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+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"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.de.po b/wiki/src/doc/anonymous_internet/icedove.de.po
index b39330b..e6d0b14 100644
--- a/wiki/src/doc/anonymous_internet/icedove.de.po
+++ b/wiki/src/doc/anonymous_internet/icedove.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2016-01-24 11:31+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -119,12 +119,19 @@ msgstr ""
"um E-Mails mit OpenPGP zu verschlüsseln und authentifizieren.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
+#| "<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.fa.po b/wiki/src/doc/anonymous_internet/icedove.fa.po
index cfac680..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fa.po
+++ b/wiki/src/doc/anonymous_internet/icedove.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.fr.po b/wiki/src/doc/anonymous_internet/icedove.fr.po
index 113a0b8..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fr.po
+++ b/wiki/src/doc/anonymous_internet/icedove.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.mdwn b/wiki/src/doc/anonymous_internet/icedove.mdwn
index dbaeb1a..4b73444 100644
--- a/wiki/src/doc/anonymous_internet/icedove.mdwn
+++ b/wiki/src/doc/anonymous_internet/icedove.mdwn
@@ -44,7 +44,7 @@ extension to encrypt and authenticate emails using OpenPGP.
To configure <span class="application">Enigmail</span> for your email account, you can start the
<span class="application">Enigmail Setup Wizard</span> by choosing
<span class="menuchoice">
- <span class="guimenu">[[!img menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Enigmail</span>&nbsp;▸
<span class="guimenuitem">Setup Wizard</span></span>.
diff --git a/wiki/src/doc/anonymous_internet/icedove.pt.po b/wiki/src/doc/anonymous_internet/icedove.pt.po
index 113a0b8..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.pt.po
+++ b/wiki/src/doc/anonymous_internet/icedove.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
index 571d274..ef8fe4a 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
@@ -6,26 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-11-03 02:15+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2016-01-24 16:15+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \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.6\n"
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, an "
-"assistant appears to guide you through the process of configuring <span class="
-"\"application\">Icedove</span> to access your email account."
+"When starting <span class=\"application\">Icedove</span> for the first time, "
+"an assistant appears to guide you through the process of configuring <span "
+"class=\"application\">Icedove</span> to access your email account."
msgstr ""
-"Wenn <span class=\"application\">Icedove</span> zum ersten Mal gestartet wird, "
-"erscheint ein Assistent, um Sie durch den Vorgang der Konfiguration von <span "
-"class=\"application\">Icedove</span> zu führen, damit Sie auf Ihr E-Mailkonto "
-"zugreifen können."
+"Wenn <span class=\"application\">Icedove</span> zum ersten Mal gestartet "
+"wird, erscheint ein Assistent, um Sie durch den Vorgang der Konfiguration "
+"von <span class=\"application\">Icedove</span> zu führen, damit Sie auf Ihr "
+"E-Mailkonto zugreifen können."
#. type: Plain text
#, no-wrap
@@ -33,13 +33,25 @@ msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
msgstr " [[!img icedove/assistant.png link=\"no\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"tip\">\n"
+#| " <p>To start this assistant again in the future from the main window of\n"
+#| " <span class=\"application\">Icedove</span>, choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Account Settings</span>\n"
+#| " </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
+#| " dialog choose <span class=\"guilabel\">Account Actions</span>&nbsp;▸\n"
+#| " <span class=\"guilabel\">Add Mail Account&hellip;</span>.</p>\n"
+#| " </div>\n"
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
" <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span>\n"
" </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
@@ -60,7 +72,8 @@ msgstr ""
" </div>\n"
#. type: Bullet: '1. '
-msgid "Enter your name, email address, and password into the corresponding fields."
+msgid ""
+"Enter your name, email address, and password into the corresponding fields."
msgstr ""
"Geben Sie Ihren Namen, Ihre E-Mail-Adresse und Ihr Kennwort in die "
"entsprechenden Textfelder ein."
@@ -150,10 +163,14 @@ msgstr ""
" E-Mail-Kontos händisch zu beenden.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <p>We will enable again the automatic account configuration in Tails\n"
+#| " 2.0.</p>\n"
+#| " </div>\n"
msgid ""
" <p>We will enable again the automatic account configuration in Tails\n"
-" 2.0.</p>\n"
+" in the future. See [[!tails_ticket 6154]].</p>\n"
" </div>\n"
msgstr ""
" <p>Wir werden die automatische Konfiguration von Konten in Tails\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po b/wiki/src/doc/anonymous_internet