summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/.htaccess4
-rw-r--r--wiki/src/about.de.po14
-rw-r--r--wiki/src/about.fr.po32
-rw-r--r--wiki/src/about.mdwn3
-rw-r--r--wiki/src/about.pt.po20
-rw-r--r--wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn6
-rw-r--r--wiki/src/blueprint/Git_sub-repositories.mdwn51
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn54
-rw-r--r--wiki/src/blueprint/Linux_containers.mdwn85
-rw-r--r--wiki/src/blueprint/Mandatory_Access_Control.mdwn57
-rw-r--r--wiki/src/blueprint/UEFI.mdwn3
-rw-r--r--wiki/src/blueprint/UEFI/syslinux.mdwn45
-rw-r--r--wiki/src/blueprint/UX_roadmap.mdwn52
-rw-r--r--wiki/src/blueprint/VoIP_support.mdwn10
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests.mdwn68
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/Debian_packages.mdwn6
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/build.mdwn6
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/continuous_integration.mdwn32
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/cucumber.mdwn3
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/testing.mdwn67
-rw-r--r--wiki/src/blueprint/download_extension.mdwn6
-rw-r--r--wiki/src/blueprint/easier_YouTube.mdwn1
-rw-r--r--wiki/src/blueprint/evaluate_Docker.mdwn35
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI.mdwn (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn)15
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/1st_prototype.mdwn (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/1st_prototype.mdwn)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/feedback_on_0.X.mdwn (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/feedback_on_0.X.mdwn)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter+persistence+kbd.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence+kbd.png)bin43079 -> 43079 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter+persistence.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence.png)bin44162 -> 44162 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.png)bin86813 -> 86813 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.svg (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.svg)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.pngbin0 -> 21137 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg201
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.pngbin0 -> 106803 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg809
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.pngbin0 -> 130545 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg784
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-flow.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.png)bin198160 -> 198160 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-flow.svg (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.svg)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.png)bin30622 -> 30622 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.svg (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.svg)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.pngbin0 -> 113791 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg446
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.png)bin82777 -> 82777 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.svg (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.svg)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.png)bin47177 -> 47177 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.svg (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.svg)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-opt-adm.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-adm.png)bin22234 -> 22234 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-opt-locale.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-locale.png)bin15503 -> 15503 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter-opt-persistence.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-persistence.png)bin23314 -> 23314 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/greeter.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/greeter.png)bin36739 -> 36739 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/menu.png (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/menu.png)bin24026 -> 24026 bytes
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups.mdwn (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups.mdwn)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/README (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/README)0
-rwxr-xr-xwiki/src/blueprint/greeter_revamp_UI/mockups/mockup.py (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter1.ui (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter1.ui)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter2.ui (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter2.ui)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter3.ui (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter3.ui)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter4.ui (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter4.ui)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter5.ui (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter5.ui)0
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/possible_roadmaps.mdwn (renamed from wiki/src/blueprint/tails-greeter:_revamp_UI/possible_roadmaps.mdwn)0
-rw-r--r--wiki/src/blueprint/hardware_for_automated_tests.mdwn83
-rw-r--r--wiki/src/blueprint/incremental_upgrades.mdwn152
-rw-r--r--wiki/src/blueprint/kernel_hardening.mdwn2
-rw-r--r--wiki/src/blueprint/macchanger.mdwn9
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn23
-rw-r--r--wiki/src/blueprint/persistence_iceweasel_client_certificates_preset.mdwn (renamed from wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn)0
-rw-r--r--wiki/src/blueprint/python3.mdwn6
-rw-r--r--wiki/src/blueprint/remove_adblock__63__.mdwn2
-rw-r--r--wiki/src/blueprint/replace_vagrant.mdwn29
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.pngbin44930 -> 0 bytes
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.svg423
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.pngbin99798 -> 0 bytes
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.svg560
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.pngbin76082 -> 0 bytes
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.svg733
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.pngbin61797 -> 0 bytes
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.svg338
-rw-r--r--wiki/src/blueprint/test_suite_getting_rid_of_the_jruby_mess.mdwn (renamed from wiki/src/blueprint/test_suite:_getting_rid_of_the_jruby_mess.mdwn)0
-rw-r--r--wiki/src/blueprint/touchpad.mdwn33
-rw-r--r--wiki/src/blueprint/web_browser_profile_with_no_CA.mdwn10
-rw-r--r--wiki/src/blueprint/website_homepage.mdwn37
-rw-r--r--wiki/src/blueprint/website_structure.mdwn165
-rw-r--r--wiki/src/contribute.de.po17
-rw-r--r--wiki/src/contribute.fr.po394
-rw-r--r--wiki/src/contribute.mdwn4
-rw-r--r--wiki/src/contribute.pt.po58
-rw-r--r--wiki/src/contribute/build.mdwn130
-rw-r--r--wiki/src/contribute/build/website.mdwn5
-rw-r--r--wiki/src/contribute/calendar.mdwn41
-rw-r--r--wiki/src/contribute/design.mdwn246
-rw-r--r--wiki/src/contribute/design/I2P.mdwn133
-rw-r--r--wiki/src/contribute/design/I2P_Browser.mdwn56
-rw-r--r--wiki/src/contribute/design/MAC_address.mdwn14
-rw-r--r--wiki/src/contribute/design/Tor_enforcement/Network_filter.mdwn18
-rw-r--r--wiki/src/contribute/design/Unsafe_Browser.mdwn8
-rw-r--r--wiki/src/contribute/design/application_isolation.mdwn266
-rw-r--r--wiki/src/contribute/design/persistence.mdwn4
-rw-r--r--wiki/src/contribute/design/stream_isolation.mdwn14
-rw-r--r--wiki/src/contribute/design/vagrant.mdwn95
-rw-r--r--wiki/src/contribute/git.mdwn6
-rw-r--r--wiki/src/contribute/how/documentation/guidelines.mdwn23
-rw-r--r--wiki/src/contribute/how/donate.de.po267
-rw-r--r--wiki/src/contribute/how/donate.fr.po381
-rw-r--r--wiki/src/contribute/how/donate.mdwn161
-rw-r--r--wiki/src/contribute/how/donate.pt.po383
-rw-r--r--wiki/src/contribute/how/mirror.mdwn12
-rw-r--r--wiki/src/contribute/how/translate.mdwn300
-rw-r--r--wiki/src/contribute/how/translate/team/de.mdwn12
-rw-r--r--wiki/src/contribute/how/translate/team/fr.mdwn65
-rw-r--r--wiki/src/contribute/how/translate/team/new.mdwn46
-rw-r--r--wiki/src/contribute/how/translate/team/pt.mdwn4
-rw-r--r--wiki/src/contribute/how/translate/translation_progress.mdwn19
-rw-r--r--wiki/src/contribute/how/translate/with_Git.mdwn196
-rw-r--r--wiki/src/contribute/how/translate/with_Transifex.mdwn25
-rw-r--r--wiki/src/contribute/l10n_tricks.mdwn17
-rwxr-xr-xwiki/src/contribute/l10n_tricks/check_po.sh29
-rwxr-xr-xwiki/src/contribute/l10n_tricks/language_statistics.sh10
-rwxr-xr-xwiki/src/contribute/l10n_tricks/transifex_translators.sh21
-rw-r--r--wiki/src/contribute/low-hanging_fruit_sessions.mdwn20
-rw-r--r--wiki/src/contribute/meetings.mdwn25
-rw-r--r--wiki/src/contribute/meetings/201408.mdwn75
-rw-r--r--wiki/src/contribute/meetings/201409.mdwn57
-rw-r--r--wiki/src/contribute/meetings/201411.mdwn62
-rw-r--r--wiki/src/contribute/merge_policy/review.mdwn3
-rw-r--r--wiki/src/contribute/relationship_with_upstream.mdwn4
-rw-r--r--wiki/src/contribute/release_process.mdwn118
-rw-r--r--wiki/src/contribute/release_process/Debian_security_updates.mdwn11
-rw-r--r--wiki/src/contribute/release_process/iceweasel.mdwn479
-rw-r--r--wiki/src/contribute/release_process/test.mdwn112
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn12
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn4
-rw-r--r--wiki/src/contribute/release_process/test/setup.mdwn26
-rw-r--r--wiki/src/contribute/release_process/test/usage.mdwn2
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn43
-rw-r--r--wiki/src/contribute/talk.html30
-rw-r--r--wiki/src/contribute/working_together/roles/front_desk.mdwn27
-rw-r--r--wiki/src/contribute/working_together/roles/release_manager.mdwn22
-rw-r--r--wiki/src/doc.pt.po21
-rw-r--r--wiki/src/doc/about/features.de.po51
-rw-r--r--wiki/src/doc/about/features.fr.po52
-rw-r--r--wiki/src/doc/about/features.mdwn8
-rw-r--r--wiki/src/doc/about/features.pt.po78
-rw-r--r--wiki/src/doc/about/fingerprint.de.po109
-rw-r--r--wiki/src/doc/about/fingerprint.fr.po108
-rw-r--r--wiki/src/doc/about/fingerprint.mdwn27
-rw-r--r--wiki/src/doc/about/fingerprint.pt.po161
-rw-r--r--wiki/src/doc/about/openpgp_keys.de.po56
-rw-r--r--wiki/src/doc/about/openpgp_keys.fr.po83
-rw-r--r--wiki/src/doc/about/openpgp_keys.mdwn44
-rw-r--r--wiki/src/doc/about/openpgp_keys.pt.po59
-rw-r--r--wiki/src/doc/about/requirements.pt.po53
-rw-r--r--wiki/src/doc/about/tor.de.po91
-rw-r--r--wiki/src/doc/about/trust.de.po159
-rw-r--r--wiki/src/doc/about/trust.fr.po7
-rw-r--r--wiki/src/doc/about/trust.mdwn2
-rw-r--r--wiki/src/doc/about/trust.pt.po156
-rw-r--r--wiki/src/doc/about/warning.de.po4
-rw-r--r--wiki/src/doc/about/warning.fr.po6
-rw-r--r--wiki/src/doc/about/warning.mdwn2
-rw-r--r--wiki/src/doc/about/warning.pt.po86
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po6
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po10
-rw-r--r--wiki/src/doc/anonymous_internet.index.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po10
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.de.po101
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fr.po205
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.mdwn53
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.pt.po244
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/address-bar.fr.pngbin2909 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/address-bar.pngbin3725 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/lavabit.fr.pngbin28453 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/lavabit.pngbin35359 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/mozicon128.pngbin20471 -> 19033 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser/riseup.pngbin0 -> 151130 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.de.po39
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.fr.po71
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.mdwn42
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.pt.po124
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.pt.po40
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.de.po12
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.fr.po12
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.mdwn8
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.pt.po185
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.pt.po57
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.de.po25
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.fr.po41
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.mdwn15
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.pt.po45
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.de.po9
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.fr.po16
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.mdwn4
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.pt.po126
-rw-r--r--wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po43
-rw-r--r--wiki/src/doc/anonymous_internet/why_tor_is_slow.pt.po51
-rw-r--r--wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fr.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.pngbin54044 -> 54323 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.pngbin50804 -> 51070 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.fr.po7
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.de.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po24
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.mdwn4
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.pt.po6
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.de.po272
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fr.po316
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.mdwn116
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.pt.po206
-rw-r--r--wiki/src/doc/first_steps.index.de.po34
-rw-r--r--wiki/src/doc/first_steps.index.fr.po9
-rw-r--r--wiki/src/doc/first_steps.index.mdwn1
-rw-r--r--wiki/src/doc/first_steps.index.pt.po38
-rw-r--r--wiki/src/doc/first_steps/accessibility.de.po4
-rw-r--r--wiki/src/doc/first_steps/accessibility.fr.po11
-rw-r--r--wiki/src/doc/first_steps/accessibility.mdwn2
-rw-r--r--wiki/src/doc/first_steps/accessibility.pt.po106
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po10
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po12
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po33
-rw-r--r--wiki/src/doc/first_steps/installation.de.po98
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po157
-rw-r--r--wiki/src/doc/first_steps/installation.mdwn64
-rw-r--r--wiki/src/doc/first_steps/installation.pt.po190
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.pt.po21
-rw-r--r--wiki/src/doc/first_steps/installation/manual.pt.po26
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.de.po48
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fr.po76
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn36
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.pt.po278
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.de.po6
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.fr.po28
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.pt.po171
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.pt.po32
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po81
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po138
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn48
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po472
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/applications.pngbin31711 -> 29166 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/iceweasel.pngbin4421 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-de.pngbin0 -> 653 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-en.pngbin0 -> 584 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/places.pngbin34535 -> 38565 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-browser.pngbin0 -> 5402 bytes
-rw-r--r--wiki/src/doc/first_steps/media.pt.po67
-rw-r--r--wiki/src/doc/first_steps/persistence.de.po8
-rw-r--r--wiki/src/doc/first_steps/persistence.fr.po12
-rw-r--r--wiki/src/doc/first_steps/persistence.mdwn1
-rw-r--r--wiki/src/doc/first_steps/persistence.pt.po10
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.de.po75
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.fr.po98
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.mdwn32
-rw-r--r--wiki/src/doc/first_steps/persistence/check_file_system.pt.po75
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po53
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po97
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn32
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po79
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.de.po4
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fr.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.mdwn2
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.pt.po259
-rw-r--r--wiki/src/doc/first_steps/persistence/use.de.po9
-rw-r--r--wiki/src/doc/first_steps/persistence/use.fr.po18
-rw-r--r--wiki/src/doc/first_steps/persistence/use.mdwn7
-rw-r--r--wiki/src/doc/first_steps/persistence/use.pt.po31
-rw-r--r--wiki/src/doc/first_steps/reset/linux.pt.po22
-rw-r--r--wiki/src/doc/first_steps/shutdown.de.po77
-rw-r--r--wiki/src/doc/first_steps/shutdown.fr.po50
-rw-r--r--wiki/src/doc/first_steps/shutdown.mdwn14
-rw-r--r--wiki/src/doc/first_steps/shutdown.pt.po64
-rw-r--r--wiki/src/doc/first_steps/start_tails.pt.po71
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po13
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options.pt.po15
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.de.po25
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po16
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn8
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po156
-rw-r--r--wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po40
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po22
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po30
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn14
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po36
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.de.po38
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.fr.po41
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.html11
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.pt.po40
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.de.po35
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.fr.po99
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.mdwn29
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.pt.po110
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po18
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po24
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.html11
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.pt.po56
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/bad_signature.pngbin11431 -> 8457 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/good_signature.pngbin14989 -> 11225 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/key_imported.pngbin9240 -> 9182 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po6
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fr.po6
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.html2
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.pt.po231
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.de.po6
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.fr.po41
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.mdwn2
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.pt.po6
-rw-r--r--wiki/src/download.de.po12
-rw-r--r--wiki/src/download.fr.po24
-rw-r--r--wiki/src/download.html4
-rw-r--r--wiki/src/download.pt.po12
-rw-r--r--wiki/src/inc/stable_i386_date.de.po4
-rw-r--r--wiki/src/inc/stable_i386_date.fr.po16
-rw-r--r--wiki/src/inc/stable_i386_date.html2
-rw-r--r--wiki/src/inc/stable_i386_date.pt.po13
-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_url.html2
-rw-r--r--wiki/src/inc/stable_i386_release_notes.de.po23
-rw-r--r--wiki/src/inc/stable_i386_release_notes.fr.po23
-rw-r--r--wiki/src/inc/stable_i386_release_notes.html4
-rw-r--r--wiki/src/inc/stable_i386_release_notes.pt.po22
-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/index.de.po18
-rw-r--r--wiki/src/index.fr.po20
-rw-r--r--wiki/src/index.html8
-rw-r--r--wiki/src/index.pt.po42
-rw-r--r--wiki/src/lib/list.png (renamed from wiki/src/lib/forum.png)bin1453 -> 1453 bytes
-rw-r--r--wiki/src/local.css73
-rw-r--r--wiki/src/misc/unsafe_browser_warning.de.po6
-rw-r--r--wiki/src/misc/unsafe_browser_warning.fr.po26
-rw-r--r--wiki/src/misc/unsafe_browser_warning.mdwn2
-rw-r--r--wiki/src/misc/unsafe_browser_warning.pt.po6
-rw-r--r--wiki/src/news.de.po9
-rw-r--r--wiki/src/news.fr.po9
-rw-r--r--wiki/src/news.mdwn2
-rw-r--r--wiki/src/news.pt.po9
-rw-r--r--wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fr.po2
-rw-r--r--wiki/src/news/On_0days_exploits_and_disclosure.fr.po52
-rw-r--r--wiki/src/news/Tails_HackFest_2014.de.po115
-rw-r--r--wiki/src/news/Tails_HackFest_2014.fr.po115
-rw-r--r--wiki/src/news/Tails_HackFest_2014.mdwn47
-rw-r--r--wiki/src/news/Tails_HackFest_2014.pt.po115
-rw-r--r--wiki/src/news/improve_the_infrastructure_behind_Tails.de.po (renamed from wiki/src/news/Call_for_help:_improve_the_infrastructure_behind_Tails.de.po)0
-rw-r--r--wiki/src/news/improve_the_infrastructure_behind_Tails.fr.po (renamed from wiki/src/news/Call_for_help:_improve_the_infrastructure_behind_Tails.fr.po)0
-rw-r--r--wiki/src/news/improve_the_infrastructure_behind_Tails.mdwn (renamed from wiki/src/news/Call_for_help:_improve_the_infrastructure_behind_Tails.mdwn)0
-rw-r--r--wiki/src/news/improve_the_infrastructure_behind_Tails.pt.po (renamed from wiki/src/news/Call_for_help:_improve_the_infrastructure_behind_Tails.pt.po)0
-rw-r--r--wiki/src/news/report_2014_01.de.po4
-rw-r--r--wiki/src/news/report_2014_01.fr.po4
-rw-r--r--wiki/src/news/report_2014_01.mdwn2
-rw-r--r--wiki/src/news/report_2014_01.pt.po4
-rw-r--r--wiki/src/news/report_2014_06-07.de.po591
-rw-r--r--wiki/src/news/report_2014_06-07.fr.po591
-rw-r--r--wiki/src/news/report_2014_06-07.mdwn257
-rw-r--r--wiki/src/news/report_2014_06-07.pt.po591
-rw-r--r--wiki/src/news/test_0.18-rc1.de.po14
-rw-r--r--wiki/src/news/test_0.18-rc1.fr.po14
-rw-r--r--wiki/src/news/test_0.18-rc1.html2
-rw-r--r--wiki/src/news/test_0.18-rc1.pt.po14
-rw-r--r--wiki/src/news/test_1.2-rc1.de.po214
-rw-r--r--wiki/src/news/test_1.2-rc1.fr.po214
-rw-r--r--wiki/src/news/test_1.2-rc1.mdwn100
-rw-r--r--wiki/src/news/test_1.2-rc1.pt.po214
-rw-r--r--wiki/src/news/version_1.1.1.de.po148
-rw-r--r--wiki/src/news/version_1.1.1.fr.po148
-rw-r--r--wiki/src/news/version_1.1.1.mdwn69
-rw-r--r--wiki/src/news/version_1.1.1.pt.po148
-rw-r--r--wiki/src/news/version_1.1.2.de.po143
-rw-r--r--wiki/src/news/version_1.1.2.fr.po178
-rw-r--r--wiki/src/news/version_1.1.2.mdwn65
-rw-r--r--wiki/src/news/version_1.1.2.pt.po143
-rw-r--r--wiki/src/news/version_1.1.de.po156
-rw-r--r--wiki/src/news/version_1.1.fr.po137
-rw-r--r--wiki/src/news/version_1.1.mdwn2
-rw-r--r--wiki/src/news/version_1.1.pt.po8
-rw-r--r--wiki/src/news/version_1.2.de.po158
-rw-r--r--wiki/src/news/version_1.2.fr.po190
-rw-r--r--wiki/src/news/version_1.2.mdwn71
-rw-r--r--wiki/src/news/version_1.2.pt.po152
-rw-r--r--wiki/src/news/who_are_you_helping.de.po208
-rw-r--r--wiki/src/news/who_are_you_helping.fr.po208
-rw-r--r--wiki/src/news/who_are_you_helping.mdwn112
-rw-r--r--wiki/src/news/who_are_you_helping.pt.po208
-rw-r--r--wiki/src/news/who_are_you_helping/include.de.po30
-rw-r--r--wiki/src/news/who_are_you_helping/include.fr.po30
-rw-r--r--wiki/src/news/who_are_you_helping/include.html9
-rw-r--r--wiki/src/news/who_are_you_helping/include.pt.po30
-rw-r--r--wiki/src/press.de.po107
-rw-r--r--wiki/src/press.fr.po115
-rw-r--r--wiki/src/press.mdwn78
-rw-r--r--wiki/src/press.pt.po107
-rw-r--r--wiki/src/security.de.po19
-rw-r--r--wiki/src/security.fr.po19
-rw-r--r--wiki/src/security.mdwn3
-rw-r--r--wiki/src/security.pt.po26
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.0.1.de.po28
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.0.1.fr.po34
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.0.fr.po24
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.1.de.po87
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.1.fr.po87
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.1.mdwn25
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.1.pt.po87
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.2.de.po73
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.2.fr.po73
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.2.mdwn21
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.2.pt.po73
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.de.po87
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.fr.po87
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.mdwn23
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.1.pt.po87
-rw-r--r--wiki/src/security/Security_hole_in_I2P_0.9.13.de.po141
-rw-r--r--wiki/src/security/Security_hole_in_I2P_0.9.13.fr.po141
-rw-r--r--wiki/src/security/Security_hole_in_I2P_0.9.13.mdwn9
-rw-r--r--wiki/src/security/Security_hole_in_I2P_0.9.13.pt.po141
-rw-r--r--wiki/src/shortcuts.mdwn2
-rw-r--r--wiki/src/sidebar.de.po16
-rw-r--r--wiki/src/sidebar.fr.po22
-rw-r--r--wiki/src/sidebar.mdwn2
-rw-r--r--wiki/src/sidebar.pt.po17
-rw-r--r--wiki/src/support.fr.po2
-rw-r--r--wiki/src/support/chat.pt.po2
-rw-r--r--wiki/src/support/faq.de.po77
-rw-r--r--wiki/src/support/faq.fr.po176
-rw-r--r--wiki/src/support/faq.mdwn41
-rw-r--r--wiki/src/support/faq.pt.po163
-rw-r--r--wiki/src/support/known_issues.de.po204
-rw-r--r--wiki/src/support/known_issues.fr.po528
-rw-r--r--wiki/src/support/known_issues.mdwn98
-rw-r--r--wiki/src/support/known_issues.pt.po325
-rw-r--r--wiki/src/support/talk.de.po29
-rw-r--r--wiki/src/support/talk.fr.po29
-rw-r--r--wiki/src/support/talk.html8
-rw-r--r--wiki/src/support/talk.pt.po29
-rw-r--r--wiki/src/tails-accounting.key124
-rw-r--r--wiki/src/tails-bugs.key292
-rw-r--r--wiki/src/tails-email.key3113
-rw-r--r--wiki/src/tails-press.key123
-rw-r--r--wiki/src/tails-signing.key2914
-rw-r--r--wiki/src/templates/forumpage.tmpl42
-rw-r--r--wiki/src/templates/page.tmpl10
-rw-r--r--wiki/src/todo.de.po4
-rw-r--r--wiki/src/todo.fr.po9
-rw-r--r--wiki/src/todo.html2
-rw-r--r--wiki/src/todo.pt.po4
-rw-r--r--wiki/src/torrents/files/tails-i386-1.1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.1.torrentbin84144 -> 0 bytes
-rw-r--r--wiki/src/torrents/files/tails-i386-1.1.torrent.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.1~rc1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.2.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.2.packages (renamed from wiki/src/torrents/files/tails-i386-1.1.packages)320
-rw-r--r--wiki/src/torrents/files/tails-i386-1.2.torrentbin0 -> 72683 bytes
-rw-r--r--wiki/src/torrents/files/tails-i386-1.2.torrent.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-1.2~rc1.iso.sig16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0.1/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0.1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~rc1/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~rc1/i386/stable/upgrades.yml.pgp27
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1/i386/alpha/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1/i386/stable/upgrades.yml.pgp27
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1~rc1/i386/alpha/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1~rc1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1~rc1/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.1~rc1/i386/stable/upgrades.yml.pgp27
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.2/i386/alpha/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.2/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.2/i386/stable/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1.2/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1/i386/alpha/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1~rc1/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1~rc1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1~rc1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1~rc1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2.1~rc1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2/i386/alpha/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2~rc1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2~rc1/i386/stable/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/1.2~rc1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3~rc1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3~rc1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3~rc1/i386/stable/upgrades.yml.pgp16
506 files changed, 25217 insertions, 11418 deletions
diff --git a/wiki/src/.htaccess b/wiki/src/.htaccess
index 98368b7..b23c749 100644
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -40,6 +40,10 @@ RewriteRule ^doc/first_steps/manual_usb_installation/windows doc/first_steps/ins
RewriteRule ^doc/first_steps/manual_usb_installation/mac doc/first_steps/installation/manual/mac [R]
RewriteRule ^contribute/design/usb_installation contribute/design/installation [R]
RewriteRule ^doc/sensitive_documents/audio doc/sensitive_documents/sound_and_video [R]
+RewriteRule ^blueprint/tails-greeter:_revamp_UI blueprint/greeter_revamp_UI [R]
+RewriteRule ^blueprint/test_suite:_getting_rid_of_the_jruby_mess blueprint/test_suite_getting_rid_of_the_jruby_mess [R]
+RewriteRule ^blueprint/Persistence:_add_iceweasel_client_certificates_preset blueprint/persistence_iceweasel_client_certificates_preset [R]
+RewriteRule ^news/Call_for_help:_improve_the_infrastructure_behind_Tails news/improve_the_infrastructure_behind_Tails [R]
# Legacy tickets URLs
RewriteRule ^todo/custom_plymouth_theme https://labs.riseup.net/code/issues/5948 [R]
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index d483425..d0e84d2 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-11 17:38+0200\n"
+"POT-Creation-Date: 2014-11-23 12:08+0100\n"
"PO-Revision-Date: 2014-06-14 20:24-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -471,10 +471,6 @@ msgid "[Freepto](http://www.freepto.mx/)"
msgstr "[Freepto](http://www.freepto.mx/)"
#. type: Bullet: '* '
-msgid "[IprediaOS](http://www.ipredia.org/)"
-msgstr "[IprediaOS](http://www.ipredia.org/)"
-
-#. type: Bullet: '* '
msgid ""
"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
msgstr "[JonDo Live-CD](https://www.anonym-surfen.de/jondo-live-cd.html)"
@@ -484,6 +480,10 @@ msgid "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
msgstr "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
#. type: Bullet: '* '
+msgid "[SubgraphOS](https://subgraph.com/sgos/)"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
msgstr "[Whonix](https://www.whonix.org/)"
@@ -497,6 +497,10 @@ msgid "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
msgstr "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
#. type: Bullet: '* '
+msgid "[IprediaOS](http://www.ipredia.org/)"
+msgstr "[IprediaOS](http://www.ipredia.org/)"
+
+#. type: Bullet: '* '
msgid "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
msgstr "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index 1111c00..f00ff41 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2014-05-11 17:38+0200\n"
+"POT-Creation-Date: 2014-11-23 12:08+0100\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -465,28 +465,25 @@ msgstr "Projets actif"
#, fuzzy
#| msgid "[Odebian](http://www.odebian.org/)"
msgid "[Freepto](http://www.freepto.mx/)"
-msgstr "[Odebian](http://www.odebian.org/)"
-
-#. type: Bullet: '* '
-#, fuzzy
-#| msgid "[Odebian](http://www.odebian.org/)"
-msgid "[IprediaOS](http://www.ipredia.org/)"
-msgstr "[IprediaOS](http://www.ipredia.org/)"
+msgstr "[Freepto](http://www.freepto.mx/)"
#. type: Bullet: '* '
msgid ""
"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
msgstr ""
+"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
#. type: Bullet: '* '
msgid "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
msgstr "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
#. type: Bullet: '* '
-#, fuzzy
-#| msgid "[Odebian](http://www.odebian.org/)"
+msgid "[SubgraphOS](https://subgraph.com/sgos/)"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
-msgstr "[Odebian](http://www.odebian.org/)"
+msgstr "[Whonix](https://www.whonix.org/)"
#. type: Title ##
#, no-wrap
@@ -498,6 +495,10 @@ msgid "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
msgstr "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
#. type: Bullet: '* '
+msgid "[IprediaOS](http://www.ipredia.org/)"
+msgstr "[IprediaOS](http://www.ipredia.org/)"
+
+#. type: Bullet: '* '
msgid "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
msgstr "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
@@ -516,15 +517,12 @@ msgid "[The Haven Project](https://www.haven-project.org/) (dead link)"
msgstr "[The Haven Project](https://www.haven-project.org/) (lien mort)"
#. type: Bullet: '* '
-#, fuzzy
-#| msgid ""
-#| "[The Incognito LiveCD](http://anonymityanywhere.com/incognito/) (dead "
-#| "link)"
msgid ""
"[The Incognito LiveCD](http://web.archive.org/web/20090220133020/http://"
"anonymityanywhere.com/)"
msgstr ""
-"[The Incognito LiveCD](http://anonymityanywhere.com/incognito/) (lien mort)"
+"[The Incognito LiveCD](http://web.archive.org/web/20090220133020/http://"
+"anonymityanywhere.com/)"
#. type: Bullet: '* '
msgid "[Liberté Linux](http://dee.su/liberte)"
@@ -560,7 +558,7 @@ msgstr "[Ubuntu Privacy Remix](https://www.privacy-cd.org/)"
#. type: Bullet: '* '
msgid "[uVirtus](http://uvirtus.org/)"
-msgstr ""
+msgstr "[uVirtus](http://uvirtus.org/)"
#~ msgid "Anonymity online through Tor\n"
#~ msgstr "Anonymat en ligne avec Tor\n"
diff --git a/wiki/src/about.mdwn b/wiki/src/about.mdwn
index b64e218..7c04815 100644
--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -153,14 +153,15 @@ if some project is listed in the wrong category.
## Active projects
* [Freepto](http://www.freepto.mx/)
-* [IprediaOS](http://www.ipredia.org/)
* [JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)
* [Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)
+* [SubgraphOS](https://subgraph.com/sgos/)
* [Whonix](https://www.whonix.org/)
## Discontinued, abandoned or sleeping projects
* [Anonym.OS](http://sourceforge.net/projects/anonym-os/)
+* [IprediaOS](http://www.ipredia.org/)
* [ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)
* [ELE](http://www.northernsecurity.net/download/ele/) (dead link)
* [Estrella Roja](http://distrowatch.com/table.php?distribution=estrellaroja)
diff --git a/wiki/src/about.pt.po b/wiki/src/about.pt.po
index 3123347..df27c7b 100644
--- a/wiki/src/about.pt.po
+++ b/wiki/src/about.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2014-05-26 12:14+0200\n"
+"POT-Creation-Date: 2014-11-23 12:08+0100\n"
"PO-Revision-Date: 2014-04-30 20:00-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -284,9 +284,9 @@ msgid ""
"span>, the Linux standard for disk-encryption."
msgstr ""
"[[Criptografe sua memória USB ou disco rígido externo|doc/"
-"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
-"\">[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para "
-"criptografia de disco."
+"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition\">"
+"[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para criptografia "
+"de disco."
#. type: Bullet: ' - '
msgid ""
@@ -470,10 +470,6 @@ msgid "[Freepto](http://www.freepto.mx/)"
msgstr "[Freepto](http://www.freepto.mx/)"
#. type: Bullet: '* '
-msgid "[IprediaOS](http://www.ipredia.org/)"
-msgstr "[IprediaOS](http://www.ipredia.org/)"
-
-#. type: Bullet: '* '
msgid ""
"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
msgstr ""
@@ -484,6 +480,10 @@ msgid "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
msgstr "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
#. type: Bullet: '* '
+msgid "[SubgraphOS](https://subgraph.com/sgos/)"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
msgstr "[Whonix](https://www.whonix.org/)"
@@ -497,6 +497,10 @@ msgid "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
msgstr "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
#. type: Bullet: '* '
+msgid "[IprediaOS](http://www.ipredia.org/)"
+msgstr "[IprediaOS](http://www.ipredia.org/)"
+
+#. type: Bullet: '* '
msgid "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
msgstr "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
diff --git a/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn b/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
index 136ff75..8b37079 100644
--- a/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
+++ b/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
@@ -6,8 +6,6 @@ Tails should be usable by those stuck with dial-up Internet access. Recent
events have shown that in some cases, dial-up might be the last option to
reach the Internet when broadband operators have been shut down.
-This was [[discussed on the forum|forum/GNOME_PPP_for_Dial-Up__63__]].
-
# Roadmap
**Next thing to do**: make up our mind wrt. towards which one of the
@@ -138,7 +136,7 @@ Remaining issues:
* `gnome-ppp` conflicts with `resolvconf`, see [[!debbug 258064]].
* Clarify what groups must the user be part of to run wvdial /
- gnome-ppp? We've been told [[on the
- forum|forum/GNOME_PPP_for_Dial-Up__63__#comment-9b26e5014164c5ff0ebd3cc3223f6301]]
+ gnome-ppp? We've been told on the
+ forum that
the answer was `dialout` (which is already the case) and `dip`
(which is not).
diff --git a/wiki/src/blueprint/Git_sub-repositories.mdwn b/wiki/src/blueprint/Git_sub-repositories.mdwn
new file mode 100644
index 0000000..0b49b93
--- /dev/null
+++ b/wiki/src/blueprint/Git_sub-repositories.mdwn
@@ -0,0 +1,51 @@
+**Corresponding ticket**: [[!tails_ticket 7036]]
+
+# Goals
+
+Tails is built from many sources: the main Git repository and our APT
+repository (that includes binary packages built from other Git
+repositories).
+
+* See the "Diversions of bundled packages due to Tails point-releases"
+ thread on tails-dev, in August and September 2013.
+* Make it easier to determine what status of every sub-repo was used
+ to build an existing ISO.
+* Make it easier to decide what status of every sub-repo shall be used
+ to build a new ISO.
+* Simplify merging of topic and release branches: right now, we often
+ have to merge things in two Git repositories (or more), and in the
+ APT repository.
+* Build most of our custom Debian packages at ISO build time, so that
+ at least for those, the state of our APT repository doesn't matter.
+* More continuous integration!
+
+# Candidates
+
+## mr
+
+A few teams, such as the debian-installer and Debian Perl ones, that
+use many Git repositories (thousands, in case of the latter), have
+been successfully using mr to make an initial checkout easier for new
+contributors, and generally making it easier to deal with a lot of
+repositories (mass-update, etc.). We could do the same, starting with
+maintaining and publishing a .mrconfig file. The problem with mr is
+that it doesn't support branches out-of-the-box: checking out a branch
+in the main repo doesn't do the same in sub-repos; *this* could be
+automatized, but merging is another story.
+
+Ressources:
+
+* [d-i help page](http://wiki.debian.org/DebianInstaller/CheckOut)
+* [pkg-perl help page](http://pkg-perl.alioth.debian.org/git.html)
+
+## Git submodules
+
+Git submodules allow to do basically the same thing, but also to make
+it clear what version of these other repositories a given Git branch
+(in the main repo) needs.
+
+## Plenty of other solutions
+
+When searching the web for well-known problems with Git submodules,
+it's easy to find many other similar solutions or wrappers that are
+meant to workaround these limitations.
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 235a0f9..0ec3c69 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -144,3 +144,57 @@ On the other side it has a few advantage:
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
+
diff --git a/wiki/src/blueprint/Linux_containers.mdwn b/wiki/src/blueprint/Linux_containers.mdwn
new file mode 100644
index 0000000..c5bbcd7
--- /dev/null
+++ b/wiki/src/blueprint/Linux_containers.mdwn
@@ -0,0 +1,85 @@
+**Corresponding tickets**: [[!tails_ticket 6178]] and friends.
+
+[[!toc levels=2]]
+
+Background
+==========
+
+Tails currently [[uses only AppArmor for isolating
+applications|contribute/design/application_isolation]].
+
+User namespaces eventually made their way into the 3.8 kernel:
+<https://lwn.net/Articles/531114/>.
+
+Threat model
+============
+
+These are *potential* goals. It remains to be discussed which ones are
+MUST, SHOULD, etc., which can vary depending on the
+sandboxed application.
+
+* filesystem isolation?
+* X isolation? (e.g. key logging, taking pictures of the screen)
+* network isolation?
+* privilege escalation via holes in Linux?
+* privilege escalation via already running privileged daemons, or
+ setuid/setgid binaries?
+* isolation from hardware?
+ - sound: prevent sandboxed software from recording
+ - identifiers: prevent sandboxed software from learning hardware
+ identifiers, e.g. the MAC address; probably hard to achieve, since
+ containers share the host's kernel
+
+Security limitations
+====================
+
+* Until we can use Ubuntu's AppArmor profiles for LXC in Debian (most
+ notably, the mount mediation support is missing), privileged
+ containers still [seem to be
+ unsafe](https://www.stgraber.org/2014/01/01/lxc-1-0-security-features/).
+* [Unprivileged
+ containers](https://www.stgraber.org/2014/01/17/lxc-1-0-unprivileged-containers/)
+ should be enough for most of what we intend to contain. It's unclear
+ if they can be made to work on Debian Wheezy (seems to require quite
+ some backporting work). Note, however, that unprivileged containers
+ have had quite some security issues when they were introduced (and
+ for this reason, the grsec patchset disables unprivileged use of
+ user namespaces). Have things gotten better since?
+
+
+Tools to manage containers
+==========================
+
+* LXC
+* `unshare(1)`
+* [pflask](https://github.com/ghedo/pflask) automates the creation of
+ simple Linux containers based on them; it is e.g. used by
+ [pflask-debuild](https://github.com/ghedo/pflask/blob/master/tools/pflask-debuild)
+* systemd-nspawn
+* Docker, that we're [[evaluating|blueprint/evaluate_Docker]] as
+ a candidate to replace Vagrant in our easy build system
+
+Running GUI applications in containers
+======================================
+
+We're told that Subgraph OS will use LXC + xpra. In this vein:
+
+* <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
+ series](https://www.stgraber.org/2013/12/20/lxc-1-0-blog-post-series/),
+ and especially [GUI in
+ containers](https://www.stgraber.org/2014/02/09/lxc-1-0-gui-in-containers/)
+* <https://unix.stackexchange.com/questions/134939/x-and-xdotool-in-lxc-instead-of-kvm>
+* <https://stackoverflow.com/questions/16296753/can-you-run-gui-apps-in-a-docker>
+
+Other resources
+===============
+
+* <http://doger.io/> documents in details the current state of Linux
+ containers (namespaces) and of the various userspace implementations
+* [Docker, Linux Containers (LXC), and
+ security](http://www.slideshare.net/jpetazzo/docker-linux-containers-lxc-and-security):
+ good summary of the threats and solutions, as of August 2014
+* [Linux Container Security](http://mjg59.dreamwidth.org/33170.html),
+ by Matthew Garrett
diff --git a/wiki/src/blueprint/Mandatory_Access_Control.mdwn b/wiki/src/blueprint/Mandatory_Access_Control.mdwn
index 228e7da..b4447b3 100644
--- a/wiki/src/blueprint/Mandatory_Access_Control.mdwn
+++ b/wiki/src/blueprint/Mandatory_Access_Control.mdwn
@@ -11,62 +11,7 @@ Possible solutions
AppArmor
--------
-Used in Ubuntu, part of upstream Linux kernel (>= 2.6.36), supported
-to a certain degree in Debian Wheezy.
-
-Seems really easy to write and maintain policies, many already exist.
-
-- [AppArmor security
- goals](http://kerneltrap.org/Linux/AppArmors_Security_Goals)
-- [[!debwiki AppArmor]]
-
-A [critical problem with stacked
-filesystems](<https://lists.ubuntu.com/archives/apparmor/2012-April/002623.html>),
-such as aufs, must be fixed at upstream level before we can use
-AppArmor in Tails.
-
-It can be workaround'd with alias rules if
-<https://bugs.launchpad.net/apparmor/+bug/888077> is fixed , or by
-adding "Kernel based alias support". An AppArmor upstream developer is
-working on improving alias rules support so that we can workaround
-this. Once this work is complete:
-
-* We will be able to (and actually, we'll need to) add an alias rule:
-
- echo 'alias / -> /lib/live/mount/rootfs/filesystem.squashfs/,' \
- >> /etc/apparmor.d/tunables/alias
-
-* We will need to change the `/lib{,32,64}/**/ld{,32,64}-*.so mrix,`
- rule into:
-
- /lib{32,64}/**/ld{,32,64}-*.so mrix,
- /lib/{[^l],l[^i],li[^v],liv[^e],live[^/]}**/ld{,32,64}-*.so mrix,
-
- ... to avoid it to overlap due to our added alias.
-
-* We have to deal with other overlaps, such as `audit deny owner /**/*
- m,` (from the Evince profile), that will take away the executable
- mmap permission from> applications in the `/lib/live/` path, if the
- root user (who owns the file) tries to launch an application:
-
- - either we use rewrite rules instead of aliases. Rewrite rule is
- the same as alias except it doesn't result in an overlay of the
- two rule sets, hence getting rid of the deny and x perm conflicts;
- - or we need a way to define that the alias rules should have
- priority in the union, thus removing the problems; this requires
- an update to the AppArmor permission merging logic.
-
-* Alias rules dramatically increase the profiles compile time (e.g.
- 1min40 for the Evince one, and 8 seconds with the aforementioned
- rule change). To mitigate that problem, we could:
-
- - either look at the rules and see if we can't make some tweaks to
- them;
- - or ship a precompiled policy cached. As long as the parser and
- kernel are in sync, then policy can be pulled straight from the
- cache, without an compilation. If the parser detects that the
- policy is out of date, then the cache will be ignored and
- compilation will happen.
+See [[contribute/design/application_isolation]].
grsecurity
----------
diff --git a/wiki/src/blueprint/UEFI.mdwn b/wiki/src/blueprint/UEFI.mdwn
index 4008d79..969f740 100644
--- a/wiki/src/blueprint/UEFI.mdwn
+++ b/wiki/src/blueprint/UEFI.mdwn
@@ -94,8 +94,7 @@ Resources
Debian derivative is [working on this](https://github.com/dankamongmen/SprezzOS/wiki/Installer) too:
- [bug 11](https://www.sprezzatech.com/bugs/show_bug.cgi?id=11)
- [bug 104](https://www.sprezzatech.com/bugs/show_bug.cgi?id=104)
-* rEFIt developer, Rod Smith, may be willing to help:
- [[forum/Boot_fails_from_usb_thumb_drive_on_Macbook_Pro]]
+* rEFIt developer, Rod Smith, may be willing to help.
* ArchLinux' page about
[UEFI Bootloaders](https://wiki.archlinux.org/index.php/UEFI_Bootloaders)
* syslinux 6 (released in June 2013) has UEFI support. Debian Live's
diff --git a/wiki/src/blueprint/UEFI/syslinux.mdwn b/wiki/src/blueprint/UEFI/syslinux.mdwn
index 974f994..a1cfa53 100644
--- a/wiki/src/blueprint/UEFI/syslinux.mdwn
+++ b/wiki/src/blueprint/UEFI/syslinux.mdwn
@@ -93,3 +93,48 @@ Miscellaneous test results
* Boots fine from DVD on HP Pavilion dm4-1150ca.
* Boots fine on Asus Z87 Pro motherboard (Tails 1.1~beta1) off a USB
stick installed with Tails Installer.
+
+# Tests with syslinux 3:6.03~pre18+dfsg-1~bpo70+1
+
+* MacBookPro 13-inch Late 2011 8,1. All what follows is using a USB
+ device installed with Tails Installer, using an experimental ISO
+ (20140731) with syslinux 3:6.03~pre18+dfsg-1~bpo70+1. The same
+ computer boots Tails 1.1 just fine.
+ - boots just fine with the default configuration
+ - uncommenting `menu background splash.png` in
+ `EFI/BOOT/stdmenu.cfg` => stuck at the Mac boot menu
+ - same as above, and add `MENU RESOLUTION 1024 768` to
+ `EFI/BOOT/tails.cfg` => displayed *once* the syslinux boot menu
+ with the expected background image, can edit the kernel cmdline,
+ but does not boot (display stuck at the syslinux menu); and then
+ I can't reproduce it, and it's stuck at the Mac boot menu, like
+ when `MENU RESOLUTION 1024 768` wasn't here.
+ - same as above, but with `MENU RESOLUTION 640 480`
+ => stuck at the Mac boot menu
+* MacBookPro9,2: with an experimental ISO built from
+ c183ad91bce6c0fa4a95c387c8f5c8387acf9a0c, same results as with 1.1;
+ and same as above MacBookPro 8,1 results wrt. menu config tweaks.
+* TOSHIBA PORTEGE Z830: boots fine with `isohybrid --entry 4 --type
+ 0x1c` and a <1GB ISO.
+* TOSHIBA PORTEGE Z930: boots fine from a stick installed with Tails
+ Installer (from DVD), while it did not boot with Tails 1.1.
+* ThinkPad X61, EeePC Seashell series, VirtualBox 4.3.14-dfsg-1 (MBR):
+ status quo, works just as fine as before
+* ASUSTeK UX31E: works fine, while it required manual selection in
+ BIOS in Tails 1.1.
+* Mid-2012 Mac Pro (6-core 3.33Ghz 32GB memory): boots fine from DVD
+* Mid-2010 15" MacBook Pro (MacBookPro 6,2): boots fine from DVD
+* Lenovo x61s: boots fine from manually installed USB stick
+* Macbook pro early 2008 (4,1): boots fine from DVD.
+* OVMF:
+ - Boots fine. Fails to shutdown (hangs at "Starting new kernel").
+ - with "menu background splash.png": boots fine. The syslinux menu is
+ as beautiful as when booting in MBR mode.
+ - with "MENU RESOLUTION 1024 768": boots fine. The menu is smaller.
+ - with "menu background splash.png" and "MENU RESOLUTION 1024 768":
+ boots fine. The menu is smaller and the background gets tiled
+ (repeated as 2x2 tiles) which is ugly.
+* MacBookPro 2.6GHZ Mid 2012 15" (A1286 / MD104LL), Tails 1.2:
+ - DVD: boots fine
+ - manual install method for mac: boots fine
+ - Tails Installer: doesn't boot
diff --git a/wiki/src/blueprint/UX_roadmap.mdwn b/wiki/src/blueprint/UX_roadmap.mdwn
new file mode 100644
index 0000000..a0cf20b
--- /dev/null
+++ b/wiki/src/blueprint/UX_roadmap.mdwn
@@ -0,0 +1,52 @@
+[[!toc levels=2]]
+
+Design by design
+================
+
+Tails is designed to be an easy-to-use Live operating system as well as a toolkit for privacy and anonymity for the masses.
+
+We organized several workshops at NUMA to improve the usability of Tails. We realized that it is hard for people who are not tech-savvy and/or new to Tails:
+
+- to understand what Tails is;
+- to install Tails;
+- to boot Tails.
+
+We want to improve this situation.
+First-time visitors on the Tails website should be able to enjoy a consistent experience, from understanding if Tails is the right tool for them, to achieving their actual goals by using it.
+
+
+From the inside, to the outside
+===============================
+
+We want to go from the inside to the outside, from the skeleton to the surface. E.g. having a rocking website _first_ might lead potential users to think that Tails is easy enough for them, while it is not the case yet, which could be problematic in some cases.
+
+This is why, hereafter you will find a description of the logical order of steps. Of course, we can still work simultaneously on all of these steps, *but* it is useful to keep the whole roadmap in mind along the way.
+
+1. Inside
+---------
+
+- Greeter revamp (High) [[!tails_ticket 5464]]
+- Network connection feedback [[!tails_ticket 7437]]
+- MAT [[!tails_ticket 7684 ]]
+- OTR [[!tails_ticket 7348 ]]
+- OpenPGP Applet [[!tails_ticket 7778 ]] [[!tails_ticket 7450 ]]
+- Shut down [[!tails_ticket 5417 ]]
+
+2. Installation
+---------------
+
+1. Refactor the installation documentation and add visual aids (installation screencast etc.)
+2. Automatic ISO verification [[!tails_ticket 7552]]
+3. Multiplatform installer [[!tails_ticket 7544]]
+
+3. Website
+----------
+
+- Re-define the goals of the website and maybe split it in differents sections [[!tails_ticket 7627]]
+- work on accessibility
+
+
+4. Outreach
+-----------
+
+- Promote Tails outside of the website, regarding the differents people and use cases where Tails could be usefull.
diff --git a/wiki/src/blueprint/VoIP_support.mdwn b/wiki/src/blueprint/VoIP_support.mdwn
index 272be83..5cad22a 100644
--- a/wiki/src/blueprint/VoIP_support.mdwn
+++ b/wiki/src/blueprint/VoIP_support.mdwn
@@ -132,13 +132,17 @@ Linphone
--------
- [homepage](http://www.linphone.org/), [[!wikipedia Linphone desc="wikipedia page"]]
-- in Debian Squeeze and Wheezy
+- in Debian Wheezy
- supports SIP over TCP and TLS
- supports IPv6
-- supports zRTP since version 3.5.1. Unfortunately, this is only available in
- Debian experimental at the moment, see [[!debbug 671815]].
+- supports zRTP since version 3.5.1, but it's not enabled in the
+ Wheezy package ([[!debbug 671815]])
- test results: 5-10s lag but one of us was using a really bad
Internet connection
+- [successfully
+ tested](https://www.whonix.org/forum/index.php/topic,407.msg3360.html#msg3360)
+ over OnionCat by Whonix folks; see the "Why OnionCat + Mumble - why
+ not just Mumble?" thread on tails-dev@ (August, 2014) for details.
- audio conferencing since 3.5.0
Mumble
diff --git a/wiki/src/blueprint/automated_builds_and_tests.mdwn b/wiki/src/blueprint/automated_builds_and_tests.mdwn
index 151c88f..8c76ae0 100644
--- a/wiki/src/blueprint/automated_builds_and_tests.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests.mdwn
@@ -22,7 +22,9 @@ ensure a few facts:
What we have
============
-* A Jenkins instance running on lizard.
+* A Jenkins instance running on lizard, that builds a few branches
+ whenever they are pushed. Results [are available
+ publicly](http://nightly.tails.boum.org/).
* A partially automated test suite:
- [[documentation|contribute/release_process/test/automated_tests]]
- [[setup|contribute/release_process/test/setup]]
@@ -36,18 +38,14 @@ Roadmap
0. Complete phase one (**build and publish ISOs automatically**):
fix all child tickets of
[[!tails_ticket 5324]].
+0. Run the test suite automatically on autobuilt ISOs:
+ [[!tails_ticket 5288]]
0. See other tickets in the *Continuous Integration* category,
and organize the next steps.
What we need
============
-Automated builds
-----------------
-
-Ideally, every commit pushed to Git should result in an ISO being
-built, and made available online.
-
Automated tests
---------------
@@ -65,8 +63,8 @@ fresh images can be tested without being transferred.
In order to be able to build Tails in memory (which greatly speeds up builds)
and to properly test HIGHMEM memory wipes, the test server should have at
least 32 GB. Using KVM inside a KVM
-virtual machine is supported by the "nested KVM" feature available since
-Linux 3.1. VirtualBox (Vagrant) in KVM is not supported as of March 2013.
+virtual machine is supported by the "nested KVM" feature.
+VirtualBox (Vagrant) in KVM is not supported as of March 2013.
We could set a threshold of tests that have to be successful before publishing
one daily build image. This would prevent too-broken images to spread out and
@@ -75,53 +73,7 @@ potentially harm users.
The setup of the automated build and test server should be done
with public Puppet modules.
-Resources
-=========
-
-## Jenkins
-
-See [[our wiki page|automated builds and tests/jenkins]] dedicated to Jenkins.
-
-## Testing tools and examples
-
-- <http://live.debian.net/gitweb/?p=live-autobuild.git> is currently
- used to build "official" daily Debian Live images
-- [buildbot](http://buildbot.net) : a continous integration bot, able to
- communicate over mail or IRC. Used by many projects.
-- Tor project's [buildbot configuration](https://gitweb.torproject.org/admin/buildbot-conf.git)
-- Martin Pitt
- [announces](http://www.piware.de/2013/02/umockdev-record-and-mock-hardware-for-debugging-and-testing/)
- umockdev ([source code](https://github.com/martinpitt/umockdev)),
- a set of tools to record and mock hardware for debugging and testing
-
-<a id="resources-debian-pkg"></a>
-
-## Building Debian packages automatically
-
-- <http://jenkins-debian-glue.org/>
-- [debile](http://anonscm.debian.org/gitweb/?p=pkg-debile/debile.git)
-- [Jenkins configuration for Kamailio Debian
- Packaging](https://github.com/sipwise/kamailio-deb-jenkins):
- glueing Jenkins, pbuilder, reprepro, jjb, nginx,
- jenkins-debian-glue, piuparts, DEP-8, and more together.
-
-## emulated boot from USB
-
-See [[the page that's dedicated to that|automated_builds_and_tests/USB]].
-
-## Buildbot
-
-We [[used to have a buildbot setup|todo/automated_builds_and_tests/buildbot]].
-
-Buildbot can be seen as a [framework](http://jacobian.org/writing/buildbot/) to
-deploy continuous integration. It has no real configuration file, but
-what deserves this role is a file that can be thought programatically.
-Thus it provide a very flexible environment that can be customize for
-most projects needs.
-
-Some interesting pages, might be worth reading for people willing to
-play with buildbot and understand its logic :
+More specific pages
+===================
-* [Chromium's buildbot config](http://src.chromium.org/viewvc/chrome/trunk/tools/build),
- which is the one driving their [builbot instance](http://build.chromium.org/)
-* [Buildbot's documentation](http://buildbot.net/buildbot/docs/latest/)
+[[!map pages="blueprint/automated_builds_and_tests/*"]]
diff --git a/wiki/src/blueprint/automated_builds_and_tests/Debian_packages.mdwn b/wiki/src/blueprint/automated_builds_and_tests/Debian_packages.mdwn
new file mode 100644
index 0000000..88b45eb
--- /dev/null
+++ b/wiki/src/blueprint/automated_builds_and_tests/Debian_packages.mdwn
@@ -0,0 +1,6 @@
+- <http://jenkins-debian-glue.org/>
+- [debile](http://anonscm.debian.org/gitweb/?p=pkg-debile/debile.git)
+- [Jenkins configuration for Kamailio Debian
+ Packaging](https://github.com/sipwise/kamailio-deb-jenkins):
+ glueing Jenkins, pbuilder, reprepro, jjb, nginx,
+ jenkins-debian-glue, piuparts, DEP-8, and more together.
diff --git a/wiki/src/blueprint/automated_builds_and_tests/build.mdwn b/wiki/src/blueprint/automated_builds_and_tests/build.mdwn
new file mode 100644
index 0000000..7a1ac82
--- /dev/null
+++ b/wiki/src/blueprint/automated_builds_and_tests/build.mdwn
@@ -0,0 +1,6 @@
+# Tools
+
+## live-autobuild
+
+<http://live.debian.net/gitweb/?p=live-autobuild.git> is currently
+used to build "official" daily Debian Live images
diff --git a/wiki/src/blueprint/automated_builds_and_tests/continuous_integration.mdwn b/wiki/src/blueprint/automated_builds_and_tests/continuous_integration.mdwn
new file mode 100644
index 0000000..a68b068
--- /dev/null
+++ b/wiki/src/blueprint/automated_builds_and_tests/continuous_integration.mdwn
@@ -0,0 +1,32 @@
+This page is about continuous integration servers.
+
+[[!toc levels=2]]
+
+# Tools
+
+## buildbot
+
+We [[used to have a buildbot setup|todo/automated_builds_and_tests/buildbot]].
+
+buildbot ([homepage](http://buildbot.net)) is a continous integration
+bot, able to communicate over mail or IRC. Used by many projects.
+
+Buildbot can be seen as a [framework](http://jacobian.org/writing/buildbot/) to
+deploy continuous integration. It has no real configuration file, but
+what deserves this role is a file that can be thought programatically.
+Thus it provide a very flexible environment that can be customize for
+most projects needs.
+
+Some interesting pages, might be worth reading for people willing to
+play with buildbot and understand its logic :
+
+* [Chromium's buildbot config](http://src.chromium.org/viewvc/chrome/trunk/tools/build),
+ which is the one driving their [builbot instance](http://build.chromium.org/)
+* [Buildbot's documentation](http://buildbot.net/buildbot/docs/latest/)
+* Tor project's [buildbot
+ configuration](https://gitweb.torproject.org/admin/buildbot-conf.git)
+
+## Jenkins
+
+We currently use Jenkins. See [[our dedicated page|automated builds
+and tests/jenkins]] for our notes about it.
diff --git a/wiki/src/blueprint/automated_builds_and_tests/cucumber.mdwn b/wiki/src/blueprint/automated_builds_and_tests/cucumber.mdwn
index efa8a31..ca7790b 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/cucumber.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/cucumber.mdwn
@@ -1,4 +1,3 @@
[[!meta title="Automated tests using cucumber"]]
-Merged for 0.17.2, see [[todo/automated_builds_and_tests]] for
-pointers to design and usage documentation.
+Merged in 0.17.2, see [[test/automated_tests]].
diff --git a/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn b/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn
new file mode 100644
index 0000000..908c533
--- /dev/null
+++ b/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn
@@ -0,0 +1,67 @@
+[[!meta title="Automated testing tools"]]
+
+We already have [[an automated test suite|contribute/release_process/test/automated_tests]].
+This page is about tools that could allow us to improve it.
+
+[[!toc levels=2]]
+
+# Tools
+
+## behave
+
+* [homepage](https://github.com/behave/behave)
+* Cucumber-like, in Python
+* used by GNOME
+* examples from the eog source tree, that use *behave* and *dogtail*:
+ - [feature](https://git.gnome.org/browse/eog/tree/tests/actions.feature)
+ - [steps definition](https://git.gnome.org/browse/eog/tree/tests/steps/steps.py)
+* not in Debian (2014/08/05)
+* Python (with Jython) is now Sikuli's preferred scripting language;
+ it's also the language that has the best maintained bindings to
+ interact with libvirt, accessibility technologies, and more
+* does *behave* work fine under Jython?
+
+## dogtail
+
+* [homepage](https://fedorahosted.org/dogtail/)
+* GUI test tool and automation framework written in ​Python
+* uses Accessibility (a11y) technologies to communicate with
+ desktop applications
+* used by GNOME in combination with *behave*: see the section about
+ that one
+* in Debian Wheezy
+* how much do we still need Sikuli if we have dogtail?
+
+## LDTP
+
+LDTP is an open source testing tool that uses computer assistive
+technology (accessibility) to automate GUIs. It's used by GNOME,
+Mozilla and others:
+
+* [[!wikipedia Linux_Desktop_Testing_Project]]
+* [homepage](http://ldtp.freedesktop.org/wiki/)
+* [tutorial](http://download.freedesktop.org/ldtp/doc/ldtp-tutorial.pdf)
+* The main bindings are Python, but there also are a Ruby client and
+ Perl bindings in the [Git repo](http://cgit.freedesktop.org/ldtp/ldtp2/tree/ldtp)
+* The LDTP dev mailing-list is very quiet, and it's unclear whether
+ GNOME still uses it, or instead switched to dogtail.
+
+## misc
+
+- Martin Pitt
+ [announces](http://www.piware.de/2013/02/umockdev-record-and-mock-hardware-for-debugging-and-testing/)
+ umockdev ([source code](https://github.com/martinpitt/umockdev)),
+ a set of tools to record and mock hardware for debugging and testing
+
+# Open questions
+
+## Using accessibility technologies?
+
+In some cases, it could simplify some testing steps, such as anything
+about navigating menus, that we're currently mostly avoiding since
+it's hard to do in a robust way with Sikuli.
+
+A downside is that we're not exactly testing how most users interact
+with the software. Some upsides are that it would ensure that our
+stuff does support accessibility technologies, and that we would have
+to maintain less pictures.
diff --git a/wiki/src/blueprint/download_extension.mdwn b/wiki/src/blueprint/download_extension.mdwn
index 32d7c32..b2bed3f 100644
--- a/wiki/src/blueprint/download_extension.mdwn
+++ b/wiki/src/blueprint/download_extension.mdwn
@@ -1,8 +1,10 @@
-[[!meta title="Firefox extension for downloading Tails"]]
+[[!meta title="Automatic ISO verification extension for Firefox"]]
We are planning to create a custom Firefox add-on to download and verify Tails
using SHA-256 checksum.
+[[!toc]]
+
Objectives
==========
@@ -31,6 +33,8 @@ Security considerations
should make that clear and keep providing instructions for authentication
using OpenPGP but as an additional check.
+<a id="scenario"></a>
+
Scenario
========
diff --git a/wiki/src/blueprint/easier_YouTube.mdwn b/wiki/src/blueprint/easier_YouTube.mdwn
index f96929e..cf6ae70 100644
--- a/wiki/src/blueprint/easier_YouTube.mdwn
+++ b/wiki/src/blueprint/easier_YouTube.mdwn
@@ -24,7 +24,6 @@ Alternatives
Background
==========
-* [[forum thread|forum/Youtube_is_now_automatically_HTML5_enabled]],
* [[!tor_bug 3347]]
Test reports
diff --git a/wiki/src/blueprint/evaluate_Docker.mdwn b/wiki/src/blueprint/evaluate_Docker.mdwn
index c1c0490..911f174 100644
--- a/wiki/src/blueprint/evaluate_Docker.mdwn
+++ b/wiki/src/blueprint/evaluate_Docker.mdwn
@@ -1,7 +1,30 @@
For an overview of the more general problem, see [[blueprint/replace_vagrant]].
For the detailed plans and things to evaluate in Docker, see [[!tails_ticket 7530]].
-Random notes:
+[[!toc levels=1]]
+
+Availability on target platforms
+================================
+
+(as of 20141130)
+
+Primary target platforms:
+
+* Debian Wheezy: no, even in backports; installation is [possible
+ using ugly methods](https://docs.docker.com/installation/debian/)
+* Debian Jessie: 1.3.1~dfsg1-2, and an unblock request has been filed
+ to let 1.3.2 in
+* Debian sid: 1.3.2~dfsg1-1
+* Ubuntu 14.04 LTS: 0.9.1, with 1.0.1 available in trusty-updates
+* Ubuntu 14.10: 1.2.0
+
+Bonus:
+
+* Arch: 1.3.2
+* Fedora: 1.3.0 flagged as stable, 1.3.2 in testing
+
+Random notes
+============
* Since Docker 0.9, the default execution environment is libcontainer,
instead of LXC. It now supports e.g. systemd-nspawn, libvirt-lxc,
@@ -14,3 +37,13 @@ Random notes:
<https://stackoverflow.com/questions/17989306/what-does-docker-add-to-just-plain-lxc>,
Docker comes with tools to automatically build a container from
source, version it, and upgrade it incrementally.
+* Michael Prokop [gives
+ pointers](http://michael-prokop.at/blog/2014/07/23/book-review-the-docker-book/)
+ about Docker integration with Jenkins.
+* As far as our build system is concerned, we don't care much to
+ protect the host system from the build container. The main goal is
+ to produce a reliable build environment.
+* For security info about Linux containers in general, see the
+ [[dedicated blueprint|blueprint/Linux_containers]].
+* [overclockix](https://github.com/mbentley/overclockix) uses
+ live-build and provides a Dockerfile for easier building.
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn b/wiki/src/blueprint/greeter_revamp_UI.mdwn
index cc147ac..1dcce3d 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI.mdwn
@@ -2,7 +2,7 @@
**Ticket**: [[!tails_ticket 5464 desc="#5464"]]
-[[!toc levels=2]]
+[[!toc levels=3]]
Rationale
=========
@@ -37,19 +37,25 @@ Flow
1st screen
----------
+### First-time use
+
When started from DVD or freshly installed media:
[[!img greeter-1st-screen-dvd.png size="" alt=""]]
<a href="greeter-1st-screen-dvd.svg">source</a>
+### Persistence
+
On a media with a persistent volume:
[[!img greeter-1st-screen-persistence.png size="" alt=""]]
<a href="greeter-1st-screen-persistence.svg">source</a>
-On a media with saved language and a persistent volume:
+### Saved localization
+
+On a media with saved localization options, the first region is replaced by a summary of the current settings:
[[!img greeter-1st-screen-langsaved.png size="" alt=""]]
@@ -77,6 +83,11 @@ Guided configuration
<a href="greeter-guided-check.svg">source</a>
+### Resources
+
+ - [Smashing magazine: Progress Trackers in Web Design: Examples and Best
+ Practices](http://www.smashingmagazine.com/2010/01/15/progress-trackers-in-web-design-examples-and-best-design-practices/)
+
Advanced configuration
----------------------
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/1st_prototype.mdwn b/wiki/src/blueprint/greeter_revamp_UI/1st_prototype.mdwn
index 396e54c..396e54c 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/1st_prototype.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/1st_prototype.mdwn
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/feedback_on_0.X.mdwn b/wiki/src/blueprint/greeter_revamp_UI/feedback_on_0.X.mdwn
index 2d059f4..2d059f4 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/feedback_on_0.X.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/feedback_on_0.X.mdwn
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence+kbd.png b/wiki/src/blueprint/greeter_revamp_UI/greeter+persistence+kbd.png
index 6285d92..6285d92 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence+kbd.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter+persistence+kbd.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence.png b/wiki/src/blueprint/greeter_revamp_UI/greeter+persistence.png
index ec90420..ec90420 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter+persistence.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter+persistence.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.png
index a6ebfac..a6ebfac 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.svg
index c4c3882..c4c3882 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-dvd.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-dvd.svg
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.png
new file mode 100644
index 0000000..fff29f8
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.png
Binary files differ
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg
new file mode 100644
index 0000000..84f9d38
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.2"
+ width="452.55945"
+ height="109.38216"
+ id="svg4623">
+ <defs
+ id="defs4625" />
+ <metadata
+ id="metadata4628">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ width="432.55945"
+ height="89.382156"
+ x="10"
+ y="10"
+ id="rect22803"
+ style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+ <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,54.157302,5.1168515)"
+ id="flowRoot3763-2"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8"><rect
+ width="410.1712"
+ height="35.182026"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4">Language</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,103.0827,-7.4924485)"
+ id="flowRoot3862-5-9-7-9"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-5-0"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-4-8" /></flowRegion><flowPara
+ id="flowPara3888-8-1-7-3"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">English</flowPara></flowRoot> <path
+ d="m 32.791938,61.010323 c -0.540136,-0.596839 -0.621013,-1.815121 -0.621013,-9.354139 0,-7.379616 0.08765,-8.755568 0.58966,-9.257589 0.502919,-0.502918 1.899414,-0.58966 9.493511,-0.58966 6.424899,0 9.029217,0.125375 9.354143,0.450285 0.325466,0.325489 0.450271,2.973957 0.450271,9.555364 0,8.617883 -0.03883,9.125857 -0.725794,9.493511 -0.439739,0.235341 -4.114248,0.388443 -9.322783,0.388443 -7.85207,0 -8.650793,-0.05945 -9.217995,-0.686215 z m 6.330595,-5.411397 0.740763,-1.594762 2.435523,0 c 2.411169,0 2.441933,0.01306 3.076638,1.313332 0.352619,0.722333 0.702035,1.470353 0.776503,1.662269 0.07444,0.191914 0.40957,0.243721 0.744704,0.11513 0.525469,-0.201632 0.33059,-0.943088 -1.41594,-5.387537 -2.214864,-5.636237 -2.799454,-6.552414 -3.702575,-5.802881 -0.579877,0.481251 -4.353897,9.803463 -4.353897,10.754549 0,1.094785 0.982097,0.481746 1.698281,-1.060089 z m 1.477717,-3.377141 c -0.263193,-0.695142 1.175625,-4.221424 1.722465,-4.221424 0.519975,0 1.962523,3.838991 1.639159,4.362206 C 43.64665,52.87262 40.801559,52.75347 40.60025,52.22179 z m -15.183604,-3.67866 c -3.638099,-1.662113 -5.978105,-4.962159 -6.292067,-8.873529 -0.367787,-4.581815 1.713178,-8.378666 5.713387,-10.424451 5.683729,-2.906765 12.604046,-0.26197 14.821386,5.664404 0.865937,2.314436 1.006057,5.107989 0.286147,5.705451 -0.485883,0.403255 -8.386006,0.707585 -8.756278,0.337321 -0.110114,-0.110114 0.251713,-0.883163 0.804088,-1.717859 0.552373,-0.834694 1.224242,-2.157346 1.493047,-2.93924 0.332833,-0.968153 0.769531,-1.487912 1.369029,-1.62944 0.484163,-0.114281 0.880298,-0.453479 0.880298,-0.753745 0,-0.413259 -0.61947,-0.572997 -2.548799,-0.657259 -2.312237,-0.100986 -2.581283,-0.19675 -2.898806,-1.031905 -0.446618,-1.174701 -1.041017,-1.174701 -1.487635,0 -0.317524,0.835148 -0.586568,0.930915 -2.898807,1.031905 -1.965964,0.08586 -2.548798,0.240023 -2.548798,0.67417 0,0.462382 0.78704,0.581731 4.409045,0.668575 4.215765,0.101076 4.409042,0.140754 4.409042,0.905128 0,1.099731 -1.785194,4.054864 -2.44954,4.054864 -0.297944,0 -0.988692,-0.675433 -1.534999,-1.50095 -0.546303,-0.825517 -1.129733,-1.50095 -1.29651,-1.50095 -0.81189,0 -0.681876,0.949849 0.346384,2.530588 0.624313,0.959762 1.047367,1.886993 0.940119,2.060519 -0.107241,0.173532 -1.117095,0.835906 -2.244108,1.471962 -1.877231,1.059442 -2.358083,1.765622 -1.416057,2.079629 0.201288,0.0671 1.366425,-0.480425 2.58917,-1.216726 3.581585,-2.156727 4.462003,-1.488926 4.241297,3.217017 l -0.113847,2.427468 -2.063804,0.09425 c -1.44589,0.06603 -2.569378,-0.136721 -3.752377,-0.677196 z"
+ id="path19435"
+ style="fill:#131313" />
+ <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,55.617088,38.625737)"
+ id="flowRoot3763-2-0-1"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-7-6"><rect
+ width="538.65204"
+ height="26.321278"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-8-1"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-9-3">Formats</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,103.67142,26.475984)"
+ id="flowRoot3862-5-9-0"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-2"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-8" /></flowRegion><flowPara
+ id="flowPara3888-8-1-76"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">United States</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,103.56717,8.9191325)"
+ id="flowRoot3862-5-9-7-2"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-5-2"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-4-2" /></flowRegion><flowPara
+ id="flowPara3888-8-1-7-8"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">English (US)</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,54.746007,21.24119)"
+ id="flowRoot3763-2-6-8"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-8-8"><rect
+ width="410.1712"
+ height="35.182026"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-5-1"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-2-6">Keyboard</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,55.592478,56.023639)"
+ id="flowRoot3763-2-0-2-3"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-7-7-6"><rect
+ width="538.65204"
+ height="26.321278"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-8-0-1"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-9-9-5">Timezone</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,137.89035,44.298158)"
+ id="flowRoot3862-5-9-8-3"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-7-7"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-1-3" /></flowRegion><flowPara
+ id="flowPara3888-8-1-2-6"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">(Eastern Time)</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.49020578,0,0,0.49020578,103.99666,43.881205)"
+ id="flowRoot3862-5-9-8-6-4"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-7-4-6"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-1-9-9" /></flowRegion><flowPara
+ id="flowPara3888-8-1-2-2-3"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">09:03</flowPara></flowRoot> <rect
+ width="65.68119"
+ height="12.915348"
+ x="122.55151"
+ y="26.079178"
+ id="rect29250"
+ style="fill:none;stroke:#000000;stroke-width:0.95988774;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.83955086, 3.83955086;stroke-dashoffset:0" />
+ <rect
+ width="65.68119"
+ height="12.915348"
+ x="122.15101"
+ y="42.049229"
+ id="rect29250-7"
+ style="fill:none;stroke:#000000;stroke-width:0.95988774;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.83955086, 3.83955086;stroke-dashoffset:0" />
+ <rect
+ width="65.68119"
+ height="12.915348"
+ x="122.151"
+ y="59.270519"
+ id="rect29250-6"
+ style="fill:none;stroke:#000000;stroke-width:0.95988774;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.83955086, 3.83955086;stroke-dashoffset:0" />
+ <rect
+ width="101.28108"
+ height="12.915348"
+ x="121.35001"
+ y="77.292801"
+ id="rect29250-1"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0" />
+ <g
+ transform="translate(-13.405488,-116.06422)"
+ id="g7637-0">
+ <g
+ transform="translate(19.416535,26.090969)"
+ id="g19851">
+ <rect
+ width="69.505913"
+ height="21.452444"
+ x="360.80338"
+ y="159.17714"
+ id="rect7125-7-0-1"
+ style="fill:#000000;fill-opacity:0.00392157;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <flowRoot
+ transform="translate(560.47456,-124.85324)"
+ id="flowRoot7127-5-4-8"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129-2-6-2"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131-9-4-4" /></flowRegion><flowPara
+ id="flowPara7133-1-8-8">Effacer</flowPara></flowRoot> </g>
+ </g>
+</svg>
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.png
new file mode 100644
index 0000000..fcd3442
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.png
Binary files differ
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg
new file mode 100644
index 0000000..ef4a0e4
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg
@@ -0,0 +1,809 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.2"
+ width="452.42886"
+ height="450.5137"
+ id="svg4217">
+ <defs
+ id="defs4219" />
+ <metadata
+ id="metadata4222">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ width="433.246"
+ height="70.725586"
+ x="9.3204126"
+ y="316.60104"
+ id="rect22803-6"
+ style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+ <rect
+ width="432.55945"
+ height="240.63916"
+ x="10.97791"
+ y="67.380775"
+ id="rect22803"
+ style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+ <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,46.51727,49.011171)"
+ id="flowRoot3763-2"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8"><rect
+ width="410.1712"
+ height="35.182026"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4">Language</flowPara></flowRoot> <rect
+ width="121.39091"
+ height="39.190517"
+ x="10.686585"
+ y="400.82318"
+ id="rect3779-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39333582;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.360015, 2.360015;stroke-dashoffset:0" />
+ <rect
+ width="120.83021"
+ height="39.190517"
+ x="148.91814"
+ y="400.82318"
+ id="rect3779-8-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39265221;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.35591326, 2.35591326;stroke-dashoffset:0" />
+ <rect
+ width="108.43744"
+ height="39.190517"
+ x="333.40576"
+ y="400.82318"
+ id="rect3779-5-4-1"
+ style="fill:none;stroke:#000000;stroke-width:1.0999589;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ x="47.868309"
+ y="420.62991"
+ id="text3836-4"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="47.868309"
+ y="420.62991"
+ id="tspan3838-7">Discover</tspan></text>
+ <text
+ x="183.41933"
+ y="421.45703"
+ id="text3840-4"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="183.41933"
+ y="421.45703"
+ id="tspan3842-3">Quick setup</tspan></text>
+ <flowRoot
+ transform="translate(-0.67084234,39.524267)"
+ id="flowRoot6294"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion6296"><rect
+ width="139.01183"
+ height="50.627766"
+ x="-190.4977"
+ y="150.1671"
+ id="rect6298" /></flowRegion><flowPara
+ id="flowPara6300"></flowPara></flowRoot> <path
+ d="m 211.68855,190.15672 c -0.12649,-0.12649 -0.22998,-9.25226 -0.22998,-20.27949 0,-15.15679 0.096,-20.14556 0.39355,-20.44308 0.298,-0.29798 5.54756,-0.39355 21.61879,-0.39355 11.67388,0 21.45868,0.0896 21.744,0.19907 0.28532,0.10948 0.51876,0.45928 0.51876,0.77733 0,0.59576 -42.54215,40.10174 -43.37175,40.27637 -0.24386,0.0513 -0.54688,-0.0102 -0.67337,-0.13665 z m 22.85032,-22.41411 c 9.67296,-8.92436 17.58721,-16.34665 17.58721,-16.49397 0,-0.14732 -1.13755,-0.22475 -2.5279,-0.17206 -2.39257,0.0907 -2.53812,0.13967 -2.71914,0.91569 -0.12128,0.51994 -0.4576,0.85842 -0.91927,0.92518 -0.58654,0.0848 -0.76784,-0.0939 -0.93295,-0.91937 -0.18229,-0.91148 -0.31628,-1.01364 -1.21343,-0.92517 -0.76613,0.0756 -1.05457,0.2965 -1.20016,0.91936 -0.12189,0.52147 -0.41965,0.81991 -0.81802,0.81991 -0.39835,0 -0.69611,-0.29844 -0.81801,-0.81991 -0.14559,-0.62286 -0.43402,-0.84381 -1.20016,-0.91936 -0.89715,-0.0885 -1.03113,0.0137 -1.21343,0.92517 -0.16623,0.83119 -0.34491,1.00476 -0.94638,0.91937 -0.53652,-0.0762 -0.77066,-0.35983 -0.84708,-1.02619 -0.0937,-0.81729 -0.22145,-0.90955 -1.13498,-0.81991 -0.78837,0.0773 -1.07394,0.29298 -1.21969,0.92092 -0.11556,0.49786 -0.45745,0.85879 -0.87039,0.9189 -0.53102,0.0772 -0.72489,-0.12502 -0.88447,-0.92298 -0.18406,-0.92024 -0.30961,-1.0117 -1.26138,-0.9189 -0.8167,0.0797 -1.10055,0.28945 -1.24864,0.92298 -0.12188,0.52147 -0.41964,0.81991 -0.818,0.81991 -0.39836,0 -0.69612,-0.29844 -0.81802,-0.81991 -0.1456,-0.62286 -0.43403,-0.84381 -1.20016,-0.91936 -0.89273,-0.088 -1.0315,0.0155 -1.20878,0.9019 -0.2811,1.4055 -1.46409,1.4055 -1.74519,0 -0.17728,-0.8864 -0.31605,-0.98993 -1.20877,-0.9019 -0.76614,0.0756 -1.05457,0.2965 -1.20017,0.91936 -0.12189,0.52147 -0.41964,0.81991 -0.81801,0.81991 -0.39836,0 -0.69612,-0.29844 -0.81801,-0.81991 -0.14593,-0.62427 -0.43377,-0.84375 -1.20632,-0.91982 -0.8796,-0.0866 -1.06234,0.0368 -1.37282,0.92752 -0.43005,1.23362 -1.39453,1.22824 -1.68669,-0.009 -0.16567,-0.7018 -0.37767,-0.81819 -1.49022,-0.81819 -1.2605,0 -1.29707,0.032 -1.29707,1.13308 0,0.93837 0.1409,1.16635 0.81991,1.32665 0.5208,0.12294 0.81991,0.42205 0.81991,0.8199 0,0.39837 -0.29845,0.69612 -0.81991,0.81801 -0.63353,0.14809 -0.84334,0.43194 -0.92297,1.24864 -0.0928,0.95177 -0.002,1.07732 0.91889,1.26137 0.79796,0.15959 1.00026,0.35345 0.92297,0.88447 -0.06,0.41225 -0.42188,0.75578 -0.91889,0.87229 -0.64268,0.15067 -0.81991,0.39849 -0.81991,1.14653 0,0.74804 0.17723,0.99586 0.81991,1.14652 1.24899,0.29281 1.24254,1.39973 -0.0109,1.87287 -0.85131,0.32134 -1.00281,0.5356 -0.91465,1.29361 0.0763,0.656 0.33353,0.96178 0.92557,1.10022 0.52143,0.12194 0.81991,0.41976 0.81991,0.8181 0,0.39833 -0.29848,0.69615 -0.81991,0.81809 -0.58906,0.13775 -0.84937,0.4446 -0.92457,1.08982 -0.0872,0.74849 0.063,0.95655 0.9019,1.24898 1.33323,0.46477 1.33323,1.42053 0,1.88531 -0.83888,0.29243 -0.98912,0.50049 -0.9019,1.24897 0.0751,0.64465 0.33554,0.95208 0.92285,1.08942 1.22864,0.28732 1.24439,1.25435 0.0273,1.67863 -0.80372,0.28017 -1.0095,0.5394 -1.0095,1.27164 0,0.73223 0.20578,0.99146 1.0095,1.27163 1.21705,0.42428 1.20131,1.39131 -0.0273,1.67863 -0.58731,0.13733 -0.84772,0.44476 -0.92285,1.08942 -0.0872,0.74848 0.063,0.95654 0.9019,1.24897 1.32261,0.46107 1.33419,1.42019 0.0227,1.87739 -0.78663,0.27423 -0.98389,0.53271 -0.98389,1.28928 0,0.52046 0.0931,1.03933 0.20675,1.15305 0.25458,0.25457 -0.20014,0.66384 21.23373,-19.11124 z m -14.3346,2.72495 c -0.12026,-0.12025 -0.21864,-2.91563 -0.21864,-6.21195 0,-4.43451 0.10662,-6.06233 0.40995,-6.25865 0.22548,-0.14592 2.91887,-0.31326 5.98534,-0.37186 5.66502,-0.10824 7.37919,0.13782 7.37919,1.05925 0,0.58123 -12.26904,12.00185 -12.89345,12.00185 -0.24406,0 -0.54213,-0.0984 -0.66239,-0.21864 z m 6.42263,-7.13272 c 1.93908,-1.7898 3.52561,-3.38125 3.52561,-3.53659 0,-0.15532 -1.88169,-0.24111 -4.18154,-0.19062 l -4.18154,0.0918 -0.0941,3.42144 c -0.0517,1.8818 -0.0131,3.63253 0.0859,3.89051 0.22563,0.58799 0.22485,0.58859 4.84572,-3.67653 z"
+ id="path7471-6"
+ style="fill:#2f2f2f" />
+ <g
+ transform="matrix(0.3023077,0,0,0.3023077,65.447269,67.322551)"
+ id="g7463-0">
+ <path
+ d="m 482.72971,120.15538 c -1.34613,-0.78405 -1.74647,-2.33482 -1.73469,-6.71959 0.008,-3.13517 0.38203,-6.27826 0.83024,-6.98465 0.60396,-0.95185 3.77128,-1.21073 12.23469,-1 l 11.41976,0.28434 0.29935,6.91048 c 0.21019,4.85226 -0.0876,7.15597 -1,7.73469 -1.85618,1.17741 -19.95863,0.99246 -22.04935,-0.22527 z m 28.45065,0.22527 c -0.91235,-0.57872 -1.21019,-2.88243 -1,-7.73469 l 0.29935,-6.91048 45.5,0 45.5,0 0.30354,6.47427 c 0.24551,5.23668 -0.03,6.71813 -1.44113,7.75 -1.35135,0.98813 -11.45191,1.27228 -44.80354,1.26042 -23.68238,-0.008 -43.64358,-0.38621 -44.35822,-0.83952 z m 96,0 c -0.91235,-0.57872 -1.21019,-2.88243 -1,-7.73469 l 0.29935,-6.91048 11.41976,-0.28434 c 8.46341,-0.21073 11.63073,0.0482 12.23469,1 0.44821,0.70639 0.82182,3.85601 0.83024,6.99916 0.0124,4.63617 -0.34977,5.9102 -1.91895,6.75 -2.28873,1.22489 -19.98822,1.37088 -21.86509,0.18035 z M 482.72971,101.15538 c -1.32277,-0.77045 -1.75,-2.329891 -1.75,-6.387805 0,-8.306601 0.21143,-8.532097 8,-8.532097 7.79041,0 8,0.223915 8,8.546604 0,4.298587 -0.38967,5.591568 -1.93426,6.418208 -2.46076,1.31696 -10.02491,1.28938 -12.31574,-0.0449 z m 18.82143,-0.49133 c -1.6963,-1.696296 -2.19476,-10.897614 -0.7166,-13.22792 0.57872,-0.912348 2.88243,-1.21019 7.73469,-1 l 6.91048,0.299348 0.30354,6.474267 c 0.24552,5.236685 -0.03,6.718129 -1.44113,7.750005 -2.4961,1.82519 -10.86352,1.63176 -12.79098,-0.2957 z m 20.42857,0.84254 c -2.39271,-0.91082 -2.96837,-2.434254 -2.98469,-7.898667 -0.0198,-6.626044 1.15929,-7.550554 9.14738,-7.172429 l 6.33731,0.299984 0.30354,6.474267 c 0.24552,5.236685 -0.03,6.718129 -1.44113,7.750005 -1.75413,1.28264 -8.56798,1.61058 -11.36241,0.54684 z m 18.70783,0.0314 c -1.549,-0.40229 -1.75252,-1.43809 -1.5,-7.634002 l 0.29217,-7.16856 7,0 7,0 0.30354,6.474267 c 0.24551,5.236685 -0.03,6.718129 -1.44113,7.750005 -1.68193,1.22985 -7.94848,1.54079 -11.65458,0.57828 z m 18.92976,-0.57829 c -1.41117,-1.031871 -1.68664,-2.513315 -1.44113,-7.75 l 0.30354,-6.474272 7,0 7,0 0.29124,7.122585 c 0.27373,6.694547 0.15354,7.159467 -2,7.736347 -3.83105,1.02623 -9.30848,0.71456 -11.15365,-0.63466 z m 19.05887,0.0793 c -1.47675,-1.109517 -1.74854,-2.52813 -1.5,-7.829308 l 0.30354,-6.474274 6.33731,-0.299984 c 3.8114,-0.180417 6.90038,0.16732 7.75,0.872445 1.59032,1.319845 1.94194,10.543117 0.48942,12.837631 -1.2557,1.98359 -11.05813,2.63816 -13.38027,0.89348 z m 19,0 c -1.47675,-1.109517 -1.74854,-2.52813 -1.5,-7.829308 l 0.30354,-6.474274 6.33731,-0.299984 c 3.8114,-0.180417 6.90038,0.16732 7.75,0.872445 1.59032,1.319845 1.94194,10.543117 0.48942,12.837631 -1.2557,1.98359 -11.05813,2.63816 -13.38027,0.89348 z m 19.05354,0.11632 c -1.32278,-0.77045 -1.75,-2.329891 -1.75,-6.387805 0,-8.306601 0.21143,-8.532097 8,-8.532097 7.79041,0 8,0.223915 8,8.546604 0,4.298587 -0.38967,5.591568 -1.93426,6.418208 -2.46076,1.31696 -10.02491,1.28938 -12.31574,-0.0449 z M 481.3943,80.873506 c -0.28745,-0.749084 -0.38582,-4.011584 -0.21861,-7.25 l 0.30402,-5.888028 11.12511,-0.281583 c 12.41738,-0.314291 12.32843,-0.36896 12.36123,7.597324 0.0275,6.678907 -0.85548,7.184259 -12.55291,7.184259 -7.93469,0 -10.62374,-0.332377 -11.01884,-1.361972 z m 27,0 c -0.28745,-0.749084 -0.38583,-4.011584 -0.21861,-7.25 l 0.30402,-5.888028 6.91048,-0.299348 c 7.98544,-0.345913 8.55173,0.114261 8.57421,6.967561 0.0247,7.54391 -0.27384,7.831787 -8.12306,7.831787 -4.92064,0 -7.07564,-0.394122 -7.44704,-1.361972 z m 19,0 c -0.28745,-0.749084 -0.38583,-4.011584 -0.21861,-7.25 l 0.30402,-5.888028 6.91048,-0.299348 c 7.98544,-0.345913 8.55173,0.114261 8.57421,6.967561 0.0247,7.54391 -0.27384,7.831787 -8.12306,7.831787 -4.92064,0 -7.07564,-0.394122 -7.44704,-1.361972 z m 19,0 c -0.28745,-0.749084 -0.38582,-4.011584 -0.21861,-7.25 l 0.30402,-5.888028 7.5,0 7.5,0 0.31229,4.933729 c 0.57447,9.075653 0.17122,9.566271 -7.86273,9.566271 -4.99484,0 -7.1627,-0.391847 -7.53497,-1.361972 z m 19.20826,-0.178486 c -0.89709,-2.337767 -0.73829,-10.729269 0.23198,-12.25889 0.57872,-0.912348 2.88243,-1.21019 7.73469,-1 l 6.91048,0.299348 0,7 0,7 -7.12715,0.29133 c -5.83029,0.238319 -7.24049,-0.004 -7.75,-1.331788 z m 19,0 c -0.89709,-2.337767 -0.73829,-10.729269 0.23198,-12.25889 0.57872,-0.912348 2.88243,-1.21019 7.73469,-1 l 6.91048,0.299348 0,7 0,7 -7.12715,0.29133 c -5.83029,0.238319 -7.24049,-0.004 -7.75,-1.331788 z m 19.79174,0.178486 c -0.28745,-0.749084 -0.38582,-4.011584 -0.21861,-7.25 l 0.30402,-5.888028 12.42111,-0.282152 c 14.03457,-0.318803 14.03974,-0.316245 14.06358,6.950365 0.0263,8.023358 0.35955,7.831787 -13.62306,7.831787 -9.5618,0 -12.54482,-0.3138 -12.94704,-1.361972 z M 481.5867,61.653691 c -0.33385,-0.869984 -0.60699,-4.004151 -0.60699,-6.964817 0,-6.236966 1.30564,-7.453396 8,-7.453396 6.69436,0 8,1.21643 8,7.453396 0,8.322689 -0.20959,8.546604 -8,8.546604 -5.26547,0 -6.92203,-0.354432 -7.39301,-1.581787 z m 19.63322,0.422001 c -0.7001,-0.700105 -1.24021,-3.75077 -1.24021,-7.00503 0,-6.703881 1.19021,-7.835184 8.24313,-7.835184 6.77464,0 7.91949,1.36674 7.56041,9.025733 l -0.30354,6.474267 -6.50979,0.290214 c -4.20269,0.187361 -6.94932,-0.149322 -7.75,-0.95 z m 19,0 c -1.82508,-1.825082 -1.58731,-11.350255 0.33122,-13.268785 1.92746,-1.927458 10.29487,-2.120892 12.79098,-0.295696 1.41117,1.031871 1.68665,2.513315 1.44113,7.75 l -0.30354,6.474267 -6.50979,0.290214 c -4.20269,0.187361 -6.94932,-0.149322 -7.75,-0.95 z m 19.46741,0.534076 c -0.38919,-0.389193 -0.70762,-3.734478 -0.70762,-7.433968 0,-7.629142 0.31675,-7.94966 7.83179,-7.925009 6.8533,0.02248 7.31347,0.588765 6.96756,8.574203 l -0.29935,6.910484 -6.54238,0.290957 c -3.5983,0.160026 -6.8608,-0.02747 -7.25,-0.416667 z m 19,0 c -0.38919,-0.389193 -0.70762,-3.734478 -0.70762,-7.433968 0,-7.629142 0.31675,-7.94966 7.83179,-7.925009 6.8533,0.02248 7.31347,0.588765 6.96756,8.574203 l -0.29935,6.910484 -6.54238,0.290957 c -3.5983,0.160026 -6.8608,-0.02747 -7.25,-0.416667 z m 18.95905,-0.04096 c -0.36667,-0.366663 -0.66667,-3.500831 -0.66667,-6.964813 0,-7.315865 1.05194,-8.368517 8.36283,-8.368517 5.80921,0 7.63717,1.827961 7.63717,7.63717 0,7.310893 -1.05265,8.36283 -8.36852,8.36283 -3.46398,0 -6.59815,-0.3 -6.96481,-0.666667 z m 19,0 c -0.36667,-0.366663 -0.66667,-3.500831 -0.66667,-6.964813 0,-5.20334 0.33623,-6.478096 1.93426,-7.333333 2.98944,-1.599902 10.68861,-1.269461 12.49431,0.536245 1.8971,1.897101 2.16491,11.435093 0.37143,13.228571 -1.25682,1.256818 -12.96792,1.698746 -14.13333,0.533333 z m 18.94032,-0.91512 c -0.33385,-0.869981 -0.60699,-4.004148 -0.60699,-6.964814 0,-6.236966 1.30564,-7.453396 8,-7.453396 6.69436,0 8,1.21643 8,7.453396 0,8.322689 -0.20959,8.546604 -8,8.546604 -5.26547,0 -6.92203,-0.354432 -7.39301,-1.581787 z"
+ id="path7465-4"
+ style="fill:#1a1a1a" />
+ </g>
+ <g
+ transform="matrix(0.3173703,0,0,0.3173703,35.788108,151.5593)"
+ id="g7485-2">
+ <path
+ d="m 592.68779,334.20785 c -11.59921,-3.03898 -20.61368,-8.33025 -29.74016,-17.45673 -13.1051,-13.1051 -19.47537,-28.32301 -19.47537,-46.52462 0,-18.20161 6.37027,-33.41952 19.47537,-46.52463 9.25504,-9.25503 18.20134,-14.45148 30.13411,-17.50337 15.58707,-3.9865 33.09354,-1.88483 47.691,5.72537 9.76444,5.09057 21.91158,17.23771 27.00215,27.00215 10.24844,19.658 10.24844,42.94296 0,62.60096 -5.09057,9.76444 -17.23771,21.91158 -27.00215,27.00215 -14.56359,7.59254 -32.63465,9.72669 -48.08495,5.67872 z m 32.89165,-6.58919 c 19.88955,-5.84521 35.45371,-21.5578 41.49645,-41.89216 2.39413,-8.0565 2.39413,-22.9435 0,-31 -6.11351,-20.57252 -21.53111,-35.99012 -42.10363,-42.10363 -8.0565,-2.39414 -22.9435,-2.39414 -31,0 -20.57252,6.11351 -35.99012,21.53111 -42.10363,42.10363 -2.39413,8.0565 -2.39413,22.9435 0,31 6.92324,23.29733 26.24659,40.21405 50.10363,43.86345 5.06023,0.77407 17.91932,-0.29972 23.60718,-1.97129 z m -19.53575,-4.96359 c -0.86429,-0.86428 -1.57143,-2.14454 -1.57143,-2.84501 0,-1.68973 3.26644,-4.58356 5.17375,-4.58356 1.70533,0 4.82625,3.07635 4.82625,4.75731 0,1.73261 -2.95812,4.24269 -5,4.24269 -1.02143,0 -2.56429,-0.70714 -3.42857,-1.57143 z m -24.0985,-6.47237 c -0.80664,-1.30517 1.30385,-3.9562 3.14951,-3.9562 1.64955,0 1.70714,0.51566 0.34238,3.06574 -1.14528,2.13998 -2.5053,2.48679 -3.49189,0.89046 z m 51.51375,-0.98108 c -0.63179,-1.18053 -0.86568,-2.42946 -0.51974,-2.7754 0.90827,-0.90827 4.03306,1.28124 4.03306,2.82593 0,2.23687 -2.30689,2.20369 -3.51332,-0.0505 z M 562.8785,297.0748 c -0.67276,-1.08856 2.04151,-3.8483 3.78489,-3.8483 1.22089,0 0.96985,2.43902 -0.39113,3.8 -1.50623,1.50623 -2.4841,1.52015 -3.39376,0.0483 z m 89.79376,-0.0483 c -1.36098,-1.36098 -1.61202,-3.8 -0.39113,-3.8 1.74338,0 4.45765,2.75974 3.78489,3.8483 -0.90966,1.47185 -1.88753,1.45793 -3.39376,-0.0483 z m -94.40301,-22.5201 c -3.55633,-0.85294 -3.42078,-7.62201 0.17144,-8.56139 2.67544,-0.69965 6.21168,2.03406 5.83847,4.51345 -0.3653,2.42684 -3.62231,4.62057 -6.00991,4.04794 z m 98.2677,-0.94714 c -1.13558,-0.79539 -2.06469,-2.29513 -2.06469,-3.33276 0,-4.32575 7.25158,-5.93341 8.53427,-1.89203 1.49611,4.71383 -2.54252,7.97541 -6.46958,5.22479 z M 601.85774,263.4765 c -3.12397,-5.3625 -7.904,-13.57329 -10.6223,-18.24621 -5.10868,-8.78213 -5.3451,-11.1795 -1.16105,-11.773 1.49636,-0.21226 3.78195,3.02189 10.80356,15.28721 4.89814,8.55603 9.2668,15.77959 9.70815,16.05235 0.44134,0.27277 6.33378,-2.6741 13.0943,-6.5486 l 12.29186,-7.04454 1.83804,2.2309 c 1.79426,2.17777 1.78683,2.27235 -0.31204,3.97192 -3.71082,3.00484 -26.68595,15.81997 -28.36224,15.81997 -0.96679,0 -3.84265,-3.85252 -7.27828,-9.75 z m -37.94435,-17.68268 c -1.51989,-1.12177 -1.67907,-1.6985 -0.73351,-2.65762 0.95273,-0.9664 1.53316,-0.95476 2.75,0.0551 1.62352,1.34741 2.1121,4.03518 0.73351,4.03518 -0.44488,0 -1.68238,-0.64471 -2.75,-1.43268 z m 87.55887,0.0551 c 0,-0.75765 0.69407,-1.95358 1.54238,-2.65761 1.21684,-1.00989 1.79727,-1.02153 2.75,-0.0551 0.94555,0.95911 0.78638,1.53584 -0.73351,2.65761 -2.44107,1.80167 -3.55887,1.81898 -3.55887,0.0551 z M 582.43709,226.6841 c -1.00989,-1.21684 -1.02153,-1.79727 -0.0551,-2.75 0.95911,-0.94556 1.53584,-0.78638 2.65761,0.73351 0.78797,1.06762 1.43268,2.30512 1.43268,2.75 0,1.37859 -2.68777,0.89001 -4.03517,-0.73351 z m 50.03517,0.73351 c 0,-0.44488 0.64471,-1.68238 1.43268,-2.75 1.12177,-1.51989 1.6985,-1.67907 2.65762,-0.73351 0.9664,0.95273 0.95476,1.53316 -0.0551,2.75 -1.34743,1.62352 -4.0352,2.1121 -4.0352,0.73351 z m -26.43515,-4.11947 c -3.25796,-3.60001 0.4609,-8.15043 5.384,-6.5879 4.32772,1.37357 2.6932,8.51624 -1.94885,8.51624 -0.92951,0 -2.47533,-0.86775 -3.43515,-1.92834 z"
+ id="path7477-5"
+ style="fill:#2a2a2a" />
+ </g>
+ <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,254.11726,115.52657)"
+ id="flowRoot3763-2-0-7"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-7-0"><rect
+ width="538.65204"
+ height="26.321278"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-8-05"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-9-6">Formats</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,240.8973,112.68629)"
+ id="flowRoot3862-5-9-1"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-1"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-7" /></flowRegion><flowPara
+ id="flowPara3888-8-1-0"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">United States</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,242.70809,47.850681)"
+ id="flowRoot3862-5-9-7-4"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-5-8"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-4-2" /></flowRegion><flowPara
+ id="flowPara3888-8-1-7-9"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">English (US)</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,254.02365,49.547766)"
+ id="flowRoot3763-2-6-0"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-8-0"><rect
+ width="410.1712"
+ height="35.182026"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-5-3"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-2-9">Keyboard</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,255.40223,185.92794)"
+ id="flowRoot3763-2-0-2-4"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3765-8-7-7-5"><rect
+ width="538.65204"
+ height="26.321278"
+ x="27.274118"
+ y="45.240093"
+ id="rect3767-8-8-0-4"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3769-4-9-9-4">Timezone</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,282.01392,182.15212)"
+ id="flowRoot3862-5-9-8-5"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-7-3"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-1-4" /></flowRegion><flowPara
+ id="flowPara3888-8-1-2-6"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">(Eastern Time)</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,243.26445,182.04693)"
+ id="flowRoot3862-5-9-8-6-6"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion3864-8-8-7-4-2"><rect
+ width="201.42857"
+ height="201.42857"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-6-1-9-6" /></flowRegion><flowPara
+ id="flowPara3888-8-1-2-2-3"
+ style="font-weight:normal;-inkscape-font-specification:Sans Bold">09:03</flowPara></flowRoot> <g
+ transform="translate(-15.343434,90.86386)"
+ id="g7637-0">
+ <g
+ transform="translate(19.416535,26.090969)"
+ id="g19851">
+ <rect
+ width="69.505913"
+ height="21.452444"
+ x="360.80338"
+ y="159.17714"
+ id="rect7125-7-0-1"
+ style="fill:#000000;fill-opacity:0.00392157;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <flowRoot
+ transform="translate(550.74012,-124.85324)"
+ id="flowRoot7127-5-4-8"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129-2-6-2"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131-9-4-4" /></flowRegion><flowPara
+ id="flowPara7133-1-8-8">Remember</flowPara></flowRoot> </g>
+ </g>
+ <text
+ x="92.074402"
+ y="341.96405"
+ id="text4203-9"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">Persistence</text>
+ <rect
+ width="250.18832"
+ height="22.202259"
+ x="91.199501"
+ y="353.20721"
+ id="rect3779-4-3-6-2"
+ style="fill:none;stroke:#000000;stroke-width:0.42515191;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ x="99.130592"
+ y="369.88269"
+ id="text3836-4-4-2"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="99.130592"
+ y="369.88269"
+ id="tspan3838-7-4-1">Type your passphrase to unlock</tspan></text>
+ <text
+ x="177.07268"
+ y="340.96735"
+ id="text5723-9-4"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="177.07268"
+ y="340.96735"
+ id="tspan5725-3-1"
+ style="fill:#0000ff">More info</tspan></text>
+ <g
+ transform="matrix(0.3885439,0,0,0.3885439,313.34998,352.72699)"
+ id="layer1-7-2">
+ <path
+ d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z"
+ id="rect3600-5"
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+ <g
+ transform="translate(0.36363745,-0.3636359)"
+ id="g3610-4"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <g
+ id="g3598-0"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181818"
+ y="18"
+ id="rect3604-82"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="18"
+ id="rect3604-4-2"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="18"
+ id="rect3604-8-4"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="18"
+ id="rect3604-5-7"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="translate(0,-0.13636303)"
+ id="g3604-1"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181817"
+ y="28.363634"
+ id="rect3604-0-9"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="28.363634"
+ id="rect3604-4-3-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="28.363634"
+ id="rect3604-8-6-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="28.363634"
+ id="rect3604-5-1-7"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <rect
+ width="42.742687"
+ height="6.3790541"
+ rx="1.9672368"
+ ry="2.0048456"
+ x="10.26502"
+ y="38.719563"
+ id="rect3677-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ </g>
+ <text
+ x="28.067984"
+ y="456.90982"
+ id="text3840-4-1"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="28.067984"
+ y="456.90982"
+ id="tspan3842-3-4"></tspan></text>
+ <text
+ x="48.72776"
+ y="431.41586"
+ id="text20391"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="48.72776"
+ y="431.41586"
+ id="tspan20393">Guided configuration</tspan></text>
+ <text
+ x="181.7971"
+ y="430.91086"
+ id="text20391-4"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="181.7971"
+ y="430.91086"
+ id="tspan20393-7">Advanced configuration</tspan></text>
+ <path
+ d="m -30.999034,435.33957 c -4.115381,-0.88709 -7.508568,-4.07031 -8.704665,-8.16597 -0.474836,-1.626 -0.474836,-4.50767 0,-6.13369 0.891816,-3.05371 3.105773,-5.75905 5.827367,-7.12057 0.825579,-0.41305 1.626697,-0.75098 1.78028,-0.75098 0.404781,0 0.346224,-0.32397 -0.239105,-1.32272 -0.79157,-1.35071 -0.872849,-2.67723 -0.247824,-4.04269 1.856764,-4.05581 7.810133,-3.09657 8.26719,1.33207 0.110748,1.073 -0.10502,1.78183 -1.111784,3.65336 -0.03882,0.0721 0.722278,0.51493 1.6913,0.98395 3.327417,1.61055 5.583022,4.51673 6.354819,8.18764 1.02535,4.87682 -1.567887,10.12894 -6.10307,12.36063 -2.539007,1.24941 -4.937015,1.57455 -7.514657,1.01897 z m 5.374065,-3.76034 c 1.64717,-0.63147 3.423144,-2.3159 4.28286,-4.06206 0.615032,-1.24918 0.667584,-1.5116 0.661601,-3.30372 -0.0085,-2.69016 -0.512473,-3.93436 -2.326041,-5.74793 -1.497853,-1.49788 -2.84785,-2.14762 -4.909689,-2.36315 -5.137124,-0.53692 -9.705107,4.48832 -8.6313,9.49528 0.457163,2.13174 1.943432,4.33076 3.632738,5.37483 2.05437,1.26963 4.935253,1.50943 7.289831,0.60675 z m -3.654632,-1.10869 c -0.245003,-0.63853 0.0021,-1.04794 0.634613,-1.04794 0.542113,0 0.610577,0.0688 0.610577,0.61338 0,0.51746 -0.08805,0.6235 -0.563414,0.67817 -0.359569,0.0414 -0.606248,-0.0467 -0.681776,-0.24371 z m 2.216057,-3.45541 c -2.249791,-1.69399 -2.705193,-2.15096 -4.471216,-4.48668 -1.337418,-1.76886 -1.925017,-2.7081 -1.837267,-2.93668 0.202613,-0.52826 0.691452,-0.27969 3.294957,1.67583 2.152621,1.61689 2.627945,2.09521 4.326163,4.35325 2.935005,3.90255 2.554856,4.30631 -1.312637,1.39428 z m -8.145283,-2.47381 c -0.244982,-0.63856 0.0021,-1.04792 0.634635,-1.04792 0.542092,0 0.610556,0.0687 0.610556,0.61337 0,0.51744 -0.08805,0.62348 -0.563392,0.67817 -0.359591,0.0414 -0.60627,-0.0467 -0.681799,-0.24373 z m 11.853189,-0.0127 c -0.210039,-0.54727 0.02121,-1.03331 0.525479,-1.10479 0.642867,-0.0912 1.0995,0.48178 0.812086,1.01884 -0.241672,0.45135 -1.174329,0.51126 -1.337565,0.0859 z m -5.923963,-5.91554 c -0.245003,-0.63854 0.0021,-1.04791 0.634613,-1.04791 0.542113,0 0.610577,0.0687 0.610577,0.61334 0,0.51746 -0.08805,0.62352 -0.563414,0.67817 -0.359569,0.0414 -0.606248,-0.0467 -0.681776,-0.24371 z m -0.744577,-7.69277 c 0.208977,-0.33455 0.476788,-0.4089 1.473177,-0.4089 1.043766,0 1.252044,0.0641 1.457436,0.44777 l 0.239614,0.44779 0.380934,-0.47043 c 0.460197,-0.56835 0.501038,-1.84873 0.08486,-2.65391 -0.415601,-0.8036 -1.18358,-1.24696 -2.160218,-1.24696 -1.736214,0 -2.788169,1.13016 -2.600641,2.7939 0.09208,0.81919 0.427822,1.49968 0.73938,1.49968 0.07171,0 0.244981,-0.18394 0.385601,-0.40894 z"
+ id="path21074"
+ style="fill:#121212" />
+ <path
+ d="m 157.10517,434.50211 c 0.49836,-2.02832 2.65058,-5.14529 4.48957,-6.50209 2.01427,-1.4861 2.14838,-1.20216 0.76453,1.61866 -1.00845,2.05562 -2.5594,3.92474 -4.03934,4.86803 -1.06425,0.67832 -1.37863,0.6823 -1.21476,0.0154 z m 3.89261,-0.0183 c -0.22299,-0.36082 1.22033,-2.86436 2.29891,-3.98759 1.04037,-1.08343 2.06869,-1.75492 2.31313,-1.51047 0.20013,0.20012 -1.20159,2.81694 -1.98665,3.70882 -0.76312,0.86694 -2.08432,1.94567 -2.38302,1.94567 -0.0801,0 -0.18919,-0.0704 -0.24237,-0.15644 z m 6.88708,-1.82357 c -0.0144,-5.59703 -4.17445,-9.07113 -10.86223,-9.07113 -1.41777,0 -1.87866,-0.0607 -1.95405,-0.25708 -0.16814,-0.43817 1.02219,-2.52367 2.06357,-3.61544 1.5511,-1.62617 3.38214,-2.3764 5.82161,-2.38528 l 1.2364,-0.005 0.74232,-1.09312 c 1.91075,-2.81371 4.39591,-5.072 6.89302,-6.26376 1.09568,-0.52292 4.14768,-1.46543 4.99508,-1.54258 0.3534,-0.0322 0.36593,0.06 0.30821,2.26879 -0.0331,1.26627 -0.16965,2.84243 -0.30346,3.50256 -0.52659,2.598 -2.03861,5.62125 -4.05685,8.11158 l -0.82946,1.02348 0.20481,1.09465 c 0.29076,1.55396 0.11117,4.18018 -0.3727,5.4501 -0.43131,1.13201 -1.5214,2.48991 -2.66227,3.31635 -1.06819,0.7738 -1.2208,0.70714 -1.224,-0.53461 z m 2.96434,-12.88489 c 1.2542,-0.74087 1.37513,-2.3671 0.24952,-3.3554 -1.11127,-0.97572 -2.68765,-0.64063 -3.32727,0.70726 -0.8333,1.75604 1.37355,3.65484 3.07775,2.64814 z m -14.46472,10.76676 c 0.24828,-0.82051 1.20748,-2.45763 1.94392,-3.31779 0.8979,-1.04876 2.33985,-2.08732 2.57354,-1.85363 0.22206,0.22205 -0.77788,2.30388 -1.68296,3.50388 -1.16575,1.54563 -3.15102,2.71355 -2.8345,1.66754 z"
+ id="path21112"
+ style="fill:#0c0c0c" />
+ <path
+ d="m 38.397217,435.2523 c -0.28612,-0.18005 -2.76362,-2.58233 -5.50557,-5.33841 l -4.98535,-5.01105 0,-0.83411 c 0,-0.71738 0.0825,-0.91661 0.58958,-1.42368 0.50709,-0.50709 0.70627,-0.58957 1.42379,-0.58957 l 0.83423,0 5.09136,5.07205 c 2.80026,2.78964 5.20278,5.28277 5.33894,5.54031 0.44293,0.8377 0.31772,1.49655 -0.42563,2.2399 -0.77759,0.77759 -1.50463,0.88367 -2.36135,0.34456 z m -14.6526,-7.64791 c -0.46728,-0.46727 -0.48716,-2.04248 -0.0328,-2.60351 0.38133,-0.47094 1.12556,-0.50772 1.59925,-0.079 0.26504,0.23986 0.34106,0.53457 0.34106,1.3222 0,1.14564 -0.37073,1.70716 -1.12712,1.70716 -0.23843,0 -0.58958,-0.15606 -0.78032,-0.34681 z m -6.76274,-0.12419 c -0.60321,-0.21649 -1.04042,-0.80931 -1.04042,-1.41073 0,-0.52343 0.17564,-0.78309 1.26976,-1.87721 1.09412,-1.09412 1.35379,-1.26976 1.87722,-1.26976 0.41029,0 0.72143,0.12663 0.95864,0.39016 0.76076,0.84517 0.65631,1.40876 -0.49194,2.65447 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51307 z m 6.87475,-5.63105 c -2.68517,-0.57274 -3.24105,-4.29976 -0.84237,-5.6479 1.29208,-0.72619 3.18869,-0.35604 3.98767,0.77826 1.65897,2.35517 -0.3502,5.46582 -3.1453,4.86964 z m -8.08857,-2.22132 c -0.46033,-0.46033 -0.43872,-1.06703 0.0546,-1.5304 0.59757,-0.56139 2.058,-0.53452 2.64112,0.0486 0.51928,0.51929 0.53187,0.77976 0.0662,1.37173 -0.31604,0.40178 -0.48337,0.45689 -1.38723,0.45689 -0.79663,0 -1.10585,-0.078 -1.37464,-0.34681 z m 14.8312,0.005 c -0.42868,-0.47368 -0.3919,-1.21791 0.079,-1.59925 0.56104,-0.45428 2.13624,-0.43439 2.60352,0.0329 0.19074,0.19075 0.34681,0.54189 0.34681,0.78032 0,0.75639 -0.56152,1.12712 -1.70717,1.12712 -0.78763,0 -1.08233,-0.076 -1.32219,-0.34106 z m -11.88334,-4.80801 c -0.14306,-0.0512 -0.82584,-0.64778 -1.51728,-1.32585 -1.09961,-1.07833 -1.25718,-1.3111 -1.25718,-1.85722 0,-0.8127 0.57573,-1.37845 1.40274,-1.37845 0.51535,0 0.77508,0.17751 1.83951,1.25718 0.68169,0.69144 1.2613,1.41324 1.28803,1.60398 0.10285,0.7342 -0.1954,1.31831 -0.80271,1.57206 -0.32734,0.13677 -0.61718,0.24251 -0.64408,0.23499 -0.0269,-0.008 -0.16598,-0.0556 -0.30903,-0.10669 z m 10.92442,-0.004 c -0.60322,-0.21648 -1.04042,-0.8093 -1.04042,-1.41073 0,-0.90228 2.24469,-3.14696 3.14697,-3.14696 0.41029,0 0.72145,0.12663 0.95865,0.39015 0.76076,0.84517 0.65631,1.40877 -0.49194,2.65448 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51306 z m -5.8169,-2.03547 c -0.60091,-0.60091 -0.61467,-2.11077 -0.0243,-2.66541 0.50062,-0.47031 1.05489,-0.48144 1.50611,-0.0302 0.26879,0.2688 0.3468,0.57801 0.3468,1.37464 0,0.90385 -0.0551,1.07119 -0.45689,1.38723 -0.59196,0.46564 -0.85244,0.45306 -1.37173,-0.0662 z"
+ id="path21150"
+ style="fill:#101010" />
+ <path
+ d="m 29.516974,376.58995 c -0.48649,-0.27587 -1.03074,-0.7176 -1.20944,-0.98163 -0.17871,-0.26403 -0.32797,-6.78461 -0.3317,-14.49018 -0.008,-16.18357 -0.24651,-15.26718 4.150689,-15.93569 0.52689,-0.0801 1.06285,-0.77052 1.436377,-1.85034 1.01057,-2.92143 1.104032,-2.96334 6.298188,-2.82488 l 4.683856,0.12485 0.833764,2.32186 0.833764,2.32186 3.870776,0 c 4.278092,0 4.414914,0.0769 5.233464,2.94281 0.677992,2.37375 2.952643,5.71088 5.016793,7.36009 0.895105,0.71517 2.885269,1.73324 4.422587,2.26238 l 2.795128,0.96208 0.125977,7.72029 c 0.06929,4.24616 0.02432,8.13396 -0.09996,8.63956 -0.124266,0.50559 -0.737617,1.15239 -1.363002,1.43734 -1.575825,0.71799 -35.429682,0.7084 -36.697262,-0.0104 z m 36.434278,-21.75277 c -5.236467,-1.87126 -7.997205,-5.72872 -7.982735,-11.15395 0.0089,-3.33387 0.798171,-5.29169 3.171119,-7.86603 5.829439,-6.3242 16.55335,-3.92848 19.289484,4.30926 2.018084,6.07588 -1.468369,12.85903 -7.540501,14.6706 -2.645003,0.78912 -4.806401,0.80162 -6.937367,0.0401 z m 8.364027,-9.20363 c 0.114466,-2.60204 0.02105,-3.01759 -0.773953,-3.44307 -0.513519,-0.27482 -0.904131,-0.92905 -0.904131,-1.51432 0,-1.49906 -1.626415,-3.36102 -2.935855,-3.36102 -1.786579,0 -2.747417,0.78244 -3.323972,2.70681 -0.297906,0.99432 -0.802465,1.90794 -1.121237,2.03026 -0.620002,0.23792 -0.855916,5.89566 -0.270255,6.48132 0.170133,0.17013 2.309559,0.25306 4.754281,0.18427 l 4.444943,-0.12506 0.130179,-2.95919 z m -6.337337,-3.92095 c -0.158873,-0.25707 -0.166829,-0.95363 -0.01769,-1.54791 0.19761,-0.78728 0.572844,-1.08051 1.382682,-1.08051 1.267102,0 2.168567,1.61422 1.420141,2.54299 -0.542629,0.67338 -2.386795,0.72995 -2.785133,0.0854 z"
+ id="path21247"
+ style="fill:#090909" />
+ <text
+ x="60.016979"
+ y="36.301411"
+ id="text3840-4-10"
+ xml:space="preserve"
+ style="font-size:17.99827576px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="60.016979"
+ y="36.301411"
+ id="tspan3842-3-5">Welcome to Tails!</tspan></text>
+ <text
+ x="61.724186"
+ y="51.658829"
+ id="text20391-4-7"
+ xml:space="preserve"
+ style="font-size:11.22351265px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="61.724186"
+ y="51.658829"
+ id="tspan20393-7-7">Privacy for anyone anywhere</tspan></text>
+ <g
+ transform="matrix(0.40502837,0,0,0.40502837,11.9342,11.457454)"
+ id="g5374"
+ style="fill:#000000;fill-opacity:1">
+ <path
+ d="m 88.342066,56.730068 0,16.662869 c 0,0.510289 -0.341075,0.643984 -0.760689,0.296591 L 79.077314,66.649116 C 78.658103,66.302056 78.317029,65.609 78.317029,65.098711 l 0,-2.097683 -2.657657,-2.16078 c -2.850156,-2.317289 -5.132376,-7.0217 -5.132376,-10.464763 0,-3.442323 2.29778,-4.339449 5.132376,-2.002743 l 2.657657,2.160782 0,-2.097681 c 0,-0.510046 0.341074,-0.643737 0.760285,-0.296677 l 8.503862,7.040243 c 0.420546,0.346435 0.76089,1.040613 0.76089,1.550659 z M 75.81131,51.432227 c -1.50022,-1.236708 -2.716309,-0.761675 -2.716309,1.060197 0,1.822367 1.216089,4.301887 2.716309,5.538595 l 2.505719,2.035532 0,-6.599035 -2.505719,-2.035532 z"
+ id="path5189-4"
+ style="fill:#000000;fill-opacity:1" />
+ <g
+ transform="matrix(0.46410314,0.9267926,-0.9267926,0.46410314,77.258376,-14.89278)"
+ id="g3500"
+ style="fill:#000000;fill-opacity:1">
+ <path
+ d="M 97.976,37.8 C 97.972,37.779 97.968,37.758 97.963,37.737 97.947,37.669 97.927,37.602 97.901,37.538 97.898,37.53 97.896,37.522 97.893,37.515 97.863,37.446 97.826,37.38 97.786,37.317 97.775,37.299 97.762,37.283 97.75,37.266 97.715,37.216 97.676,37.169 97.634,37.125 97.623,37.113 97.613,37.101 97.601,37.089 97.548,37.037 97.49,36.989 97.428,36.946 97.413,36.935 97.396,36.927 97.38,36.917 97.349,36.898 97.32,36.877 97.288,36.86 L 96.743,36.576 71.837016,47.695585 25.252,24.269 l -0.666,0.33 c -0.006,0.003 -0.01,0.007 -0.016,0.01 -0.047,0.024 -0.09,0.055 -0.134,0.084 -0.029,0.019 -0.06,0.036 -0.087,0.057 -0.034,0.027 -0.063,0.059 -0.094,0.09 -0.031,0.03 -0.065,0.059 -0.093,0.092 -0.022,0.026 -0.039,0.056 -0.06,0.084 -0.031,0.043 -0.063,0.086 -0.088,0.132 -0.003,0.005 -0.007,0.01 -0.01,0.015 -0.015,0.028 -0.022,0.057 -0.035,0.085 -0.02,0.046 -0.041,0.09 -0.056,0.138 -0.013,0.041 -0.02,0.082 -0.029,0.123 -0.009,0.043 -0.019,0.085 -0.024,0.128 -0.005,0.043 -0.004,0.085 -0.005,0.127 -0.001,0.044 -0.003,0.087 0.001,0.13 0.002,0.023 0.005,0.046 0.009,0.069 -0.006,0.051 -0.015,0.1 -0.015,0.152 L 23.854,41.674 27.21708,40.107419 63.622,58.211 38.537615,69.347048 l -18.939,-9.469 L 2.6090632,51.38471 c -0.012,-0.006 -0.025,-0.009 -0.038,-0.014 -0.042,-0.02 -0.086,-0.035 -0.131,-0.05 -0.04,-0.014 -0.08,-0.028 -0.121,-0.038 -0.038,-0.009 -0.078,-0.014 -0.117,-0.019 -0.049,-0.007 -0.098,-0.014 -0.148,-0.015 -0.013,0 -0.024,-0.004 -0.037,-0.004 -0.025,0 -0.049,0.006 -0.074,0.007 -0.05,0.004 -0.099,0.007 -0.148,0.016 -0.04,0.007 -0.079,0.017 -0.118,0.027 -0.043,0.011 -0.085,0.024 -0.127,0.039 -0.039,0.015 -0.077,0.032 -0.114,0.051 -0.039,0.019 -0.077,0.039 -0.115,0.062 -0.035,0.022 -0.068,0.045 -0.1,0.07 -0.035,0.027 -0.07,0.054 -0.103,0.085 -0.031,0.029 -0.059,0.059 -0.087,0.09 -0.028,0.032 -0.056,0.064 -0.082,0.099 -0.028,0.038 -0.052,0.079 -0.076,0.12 -0.013,0.023 -0.03,0.042 -0.042,0.066 -0.006,0.012 -0.008,0.025 -0.014,0.037 -0.02,0.043 -0.036,0.089 -0.051,0.135 -0.013,0.039 -0.027,0.078 -0.036,0.117 -0.009,0.04 -0.014,0.081 -0.02,0.122 -0.007,0.048 -0.013,0.095 -0.014,0.142 0.001,0.014 -0.003,0.026 -0.003,0.039 l 0,19.531 c 0,0.026 0.006,0.051 0.008,0.077 0.003,0.048 0.006,0.096 0.014,0.143 0.007,0.042 0.017,0.082 0.028,0.122 0.011,0.042 0.023,0.083 0.038,0.123 0.015,0.04 0.033,0.079 0.052,0.117 0.019,0.038 0.038,0.076 0.061,0.112 0.022,0.035 0.046,0.069 0.071,0.102 0.027,0.035 0.054,0.069 0.084,0.102 0.028,0.031 0.059,0.059 0.09,0.087 0.032,0.029 0.064,0.056 0.1,0.082 0.038,0.027 0.077,0.051 0.118,0.075 0.023,0.014 0.043,0.031 0.068,0.043 L 37.945615,91.543048 c 0.007,0.004 0.015,0.004 0.022,0.008 0.017,0.008 0.032,0.017 0.049,0.025 0.01,0.004 0.02,0.007 0.03,0.011 0.056,0.022 0.113,0.041 0.171,0.055 0.012,0.003 0.024,0.006 0.036,0.009 0.016,0.003 0.032,0.005 0.048,0.008 0.077,0.014 0.154,0.024 0.232,0.024 0.001,0 0.002,0 0.003,0 l 0.001,0 10e-4,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.156,-0.01 0.232,-0.024 0.016,-0.003 0.032,-0.005 0.048,-0.008 0.012,-0.003 0.024,-0.006 0.036,-0.009 0.058,-0.014 0.115,-0.033 0.17,-0.055 0.01,-0.004 0.021,-0.007 0.031,-0.011 0.017,-0.007 0.032,-0.017 0.049,-0.024 0.007,-0.003 0.015,-0.004 0.022,-0.008 L 61.746,81.642 l 9.462,5.221 c 0.018,0.01 0.037,0.017 0.056,0.026 0.019,0.01 0.038,0.02 0.058,0.029 0.008,0.003 0.016,0.007 0.024,0.01 0.031,0.013 0.063,0.023 0.095,0.033 0.019,0.006 0.038,0.013 0.058,0.019 0.021,0.006 0.043,0.011 0.064,0.015 0.015,0.003 0.029,0.006 0.044,0.008 0.007,0.001 0.015,0.003 0.022,0.004 0.014,0.002 0.028,0.006 0.042,0.008 0.059,0.008 0.117,0.013 0.176,0.013 l 0.001,0 0.001,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.155,-0.01 0.232,-0.024 0.013,-0.002 0.026,-0.003 0.039,-0.006 0.01,-0.002 0.019,-0.006 0.029,-0.008 0.07,-0.017 0.14,-0.037 0.207,-0.065 0.007,-0.003 0.014,-0.007 0.021,-0.01 0.004,-0.002 0.008,-0.004 0.012,-0.006 0.006,-0.003 0.012,-0.003 0.018,-0.006 L 97.238,75.317 C 97.703,75.098 98,74.631 98,74.117 L 98,38.034 C 98,38.028 97.998,38.023 97.998,38.017 97.997,37.943 97.989,37.871 97.976,37.8 z m -60.762385,40.617048 -7.614,3.666 3.972,1.986 3.641,-1.986 0,6.29 -33.8715518,-16.935338 0,-9.829 8.6775518,4.241338 -7.2569997,3.35 3.972,1.986 7.2689997,-3.378 4.313,2.051 -7.487,3.456 3.972,1.986 7.503,-3.482 4.621,2.344 -7.381,3.407 3.972,1.986 7.395,-3.434 4.303,2.111 z M 65.228,76.939 39.861615,88.216048 l 0,-16.57 L 65.228,60.37 z M 3.3410632,58.52771 l 0,-3.31 33.8725518,16.603338 0,3.31 z"
+ id="path3502"
+ style="fill:#000000;fill-opacity:1" />
+ </g>
+ <polygon
+ points="39.407,53.262 45.366,56.241 39.076,59.22 33.117,56.241 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.46318,-16.30443)"
+ id="polygon3506"
+ style="fill:#000000;fill-opacity:1" />
+ <polygon
+ points="22.855,50.613 29.145,47.634 35.103,50.613 28.814,53.593 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.02568,-16.55443)"
+ id="polygon3508"
+ style="fill:#000000;fill-opacity:1" />
+ <g
+ transform="matrix(0,-0.2492475,0.19547686,0.16114179,71.005984,62.192969)"
+ id="Captions"
+ style="fill:#000000;fill-opacity:1" />
+ <g
+ transform="translate(122.10986,-55.111168)"
+ id="Captions-7"
+ style="fill:#000000;fill-opacity:1" />
+ <path
+ d="m 45.058193,34.347585 c 2.124399,2.704098 4.295157,7.985437 4.295157,12.865587 0,4.87818 -2.170758,6.542025 -4.295157,5.703941 0,-1.998055 0,-16.795084 0,-18.569528 z"
+ id="path4818-2-4-3"
+ style="fill:#000000;fill-opacity:1" />
+ <g
+ transform="translate(74.936297,109.72221)"
+ id="Your_Icon"
+ style="fill:#000000;fill-opacity:1" />
+ </g>
+ <rect
+ width="131.91261"
+ height="191.64781"
+ x="26.495918"
+ y="109.19056"
+ id="rect7488"
+ style="fill:#000000;fill-opacity:0.00392157;stroke:#000000;stroke-width:1.21530211;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <flowRoot
+ transform="matrix(0.66250987,0,0,0.66250987,3.2790811,66.17356)"
+ id="flowRoot3862-5-4"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:150%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><flowRegion
+ id="flowRegion3864-8-9"><rect
+ width="167.09315"
+ height="569.1496"
+ x="45.714287"
+ y="70.933609"
+ id="rect3866-4-4"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:150%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans" /></flowRegion><flowPara
+ id="flowPara3888-8-14">English</flowPara><flowPara
+ id="flowPara7597">Français</flowPara><flowPara
+ id="flowPara7599">Italiano</flowPara><flowPara
+ id="flowPara7601">Español</flowPara><flowPara
+ id="flowPara7605">Deutsch</flowPara><flowPara
+ id="flowPara7611">Portugues</flowPara><flowPara
+ id="flowPara23475">Farsi</flowPara><flowPara
+ id="flowPara23499">Arabic</flowPara><flowPara
+ id="flowPara23479">Chinese</flowPara><flowPara
+ id="flowPara23503">Vietnamese</flowPara><flowPara
+ id="flowPara32831">...</flowPara><flowPara
+ id="flowPara23477" /><flowPara
+ id="flowPara7609" /><flowPara
+ id="flowPara7603" /></flowRoot> <path
+ d="m 145.39789,292.63698 c -1.85645,-2.8816 -3.33568,-5.34268 -3.28718,-5.46908 0.13136,-0.34233 13.55611,-0.34003 13.68749,0.002 0.10361,0.27 -6.48734,10.58658 -6.80911,10.65807 -0.12085,0.0268 -1.70124,-2.25774 -3.5912,-5.19134 z"
+ id="path7560"
+ style="fill:#0b0b0b" />
+ <path
+ d="m 151.74765,118.55396 c 1.85645,2.8816 3.33568,5.34268 3.28718,5.46908 -0.13135,0.34233 -13.5561,0.34003 -13.68748,-0.002 -0.10361,-0.27 6.48734,-10.58658 6.8091,-10.65807 0.12075,-0.0272 1.70124,2.25774 3.59121,5.19134 z"
+ id="path7560-8"
+ style="fill:#0b0b0b" />
+ <g
+ transform="translate(-8.2234761,96.821973)"
+ id="g8354">
+ <rect
+ width="69.505913"
+ height="21.452444"
+ x="496.40955"
+ y="198.64963"
+ id="rect7125"
+ style="fill:#999999;fill-opacity:0.00392157;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <flowRoot
+ transform="translate(696.3463,-85.38073)"
+ id="flowRoot7127"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131"
+ style="fill:#000000" /></flowRegion><flowPara
+ id="flowPara7133">Unlock</flowPara></flowRoot> </g>
+ <flowRoot
+ transform="matrix(0.64338496,0,0,0.64338496,356.03326,187.57504)"
+ id="flowRoot8224"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion8226"><rect
+ width="90.958359"
+ height="20.594345"
+ x="341.52289"
+ y="302.05042"
+ id="rect8228"
+ style="fill:#0000ff" /></flowRegion><flowPara
+ id="flowPara8230">Disable</flowPara></flowRoot> <flowRoot
+ transform="translate(146.00999,26.312011)"
+ id="flowRoot8224-7"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion8226-6"><rect
+ width="90.958359"
+ height="20.594345"
+ x="341.52289"
+ y="302.05042"
+ id="rect8228-4"
+ style="fill:#000000" /></flowRegion><flowPara
+ id="flowPara8230-3">Checking...</flowPara></flowRoot> <flowRoot
+ transform="translate(146.1503,52.824941)"
+ id="flowRoot8224-7-8"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion8226-6-7"><rect
+ width="90.958359"
+ height="20.594345"
+ x="341.52289"
+ y="302.05042"
+ id="rect8228-4-3"
+ style="fill:#ff0000" /></flowRegion><flowPara
+ id="flowPara8230-3-9">Bad passphrase</flowPara></flowRoot> <rect
+ width="69.505913"
+ height="21.452444"
+ x="489.31949"
+ y="380.94101"
+ id="rect7125-6-6"
+ style="fill:#999999;fill-opacity:0.00392157;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <flowRoot
+ transform="translate(682.05167,97.512944)"
+ id="flowRoot7127-7-0"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00ff00;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129-5-7"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131-5-4"
+ style="fill:#00ff00" /></flowRegion><flowPara
+ id="flowPara7133-4-5">Unlocked</flowPara></flowRoot> <text
+ x="642.06433"
+ y="366.45779"
+ id="text4540-5-1-9"
+ xml:space="preserve"
+ style="font-size:8.48354626px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="642.06433"
+ y="366.45779"
+ id="tspan4542-2-3-5">Show passphase</tspan></text>
+ <rect
+ width="7.8750005"
+ height="7.7148786"
+ x="625.13757"
+ y="360.06381"
+ id="rect8465-1"
+ style="fill:none;stroke:#000000;stroke-width:0.50005716;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ d="m 580.49582,363.11468 17.03347,0"
+ id="path8491"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ d="m 593.80322,355.13024 4.25836,7.45214 -4.25836,7.98444"
+ id="path8493"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <text
+ x="651.14307"
+ y="392.33334"
+ id="text4540-5-1-9-8"
+ xml:space="preserve"
+ style="font-size:8.48354626px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="651.14307"
+ y="392.33334"
+ id="tspan4542-2-3-5-3">Passphrase greyed out</tspan><tspan
+ x="651.14307"
+ y="392.33334"
+ id="tspan8533" /></text>
+ <flowRoot
+ transform="translate(5.7765239,100.82197)"
+ id="flowRoot8525"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion8527"><rect
+ width="20.227245"
+ height="17.03347"
+ x="629.17377"
+ y="280.51996"
+ id="rect8529" /></flowRegion><flowPara
+ id="flowPara8531">+</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.64338496,0,0,0.64338496,356.5339,196.73277)"
+ id="flowRoot8224-0"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion8226-7"><rect
+ width="90.958359"
+ height="20.594345"
+ x="341.52289"
+ y="302.05042"
+ id="rect8228-5"
+ style="fill:#0000ff" /></flowRegion><flowPara
+ id="flowPara8230-2">Configure</flowPara></flowRoot> <rect
+ width="230.3187"
+ height="58.8176"
+ x="204.6572"
+ y="74.505447"
+ id="rect29250"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0" />
+ <rect
+ width="230.3187"
+ height="58.8176"
+ x="204.6572"
+ y="142.22124"
+ id="rect29250-7"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0" />
+ <rect
+ width="230.3187"
+ height="58.8176"
+ x="204.6572"
+ y="210.68929"
+ id="rect29250-9"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0" />
+ <path
+ d="m 348.29384,433.98541 c -3.57554,-0.77053 -6.60849,-2.80863 -8.64724,-5.81084 -3.32695,-4.89914 -3.05831,-11.55911 0.65293,-16.18717 3.20804,-4.00056 8.41532,-5.93428 13.31645,-4.94505 9.6993,1.95769 14.32378,13.033 8.82371,21.13222 -3.13193,4.61199 -8.83603,6.95511 -14.14585,5.81084 z m 4.30724,-10.05337 c 4.4012,-2.56045 5.13203,-3.04651 5.13203,-3.41328 0,-0.36747 -0.73194,-0.85012 -5.19895,-3.42832 -3.22898,-1.86364 -5.34723,-2.9795 -5.59026,-2.94483 -0.38951,0.0555 -0.3915,0.0836 -0.43962,6.1946 -0.0265,3.37633 -0.008,6.24248 0.04,6.36921 0.0486,0.12672 0.27659,0.22542 0.50656,0.21932 0.22998,-0.006 2.72755,-1.35462 5.55018,-2.9967 z"
+ id="path31797"
+ style="fill:#060606" />
+ <text
+ x="368.58942"
+ y="419.20029"
+ id="text3840-4-2"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="368.58942"
+ y="419.20029"
+ id="tspan3842-3-1">Start</tspan></text>
+ <text
+ x="369.14297"
+ y="428.32074"
+ id="text20391-4-9"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="369.14297"
+ y="428.32074"
+ id="tspan20393-7-78">Default configuration</tspan></text>
+ <path
+ d="m 355.57304,523.47464 c 10.25375,-5.96524 11.95641,-7.09764 11.95641,-7.95213 0,-0.85612 -1.70525,-1.98058 -12.11232,-7.98717 -7.52275,-4.34184 -12.45777,-6.94153 -13.02398,-6.86075 -0.90746,0.1293 -0.9121,0.19476 -1.02421,14.43194 -0.0618,7.86605 -0.0186,14.54349 0.0932,14.83875 0.11324,0.29522 0.64439,0.52517 1.18017,0.51096 0.5358,-0.014 6.35455,-3.15594 12.9306,-6.9816 z"
+ id="path31797-6"
+ style="fill:#060606" />
+ <path
+ d="m 488.59375,261 a 0.50005,0.50005 0 0 0 -0.46875,0.5 l 0,21.46875 a 0.50005,0.50005 0 0 0 0.5,0.5 l 69.53125,0 a 0.50005,0.50005 0 0 0 0.5,-0.5 l 0,-21.46875 a 0.50005,0.50005 0 0 0 -0.5,-0.5 l -69.53125,0 a 0.50005,0.50005 0 0 0 -0.0312,0 z m 0.53125,1 68.53125,0 0,20.46875 -68.53125,0 0,-20.46875 z"
+ id="rect7125-7"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <flowRoot
+ transform="translate(688.57472,-22.521027)"
+ id="flowRoot7127-0"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#999999;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129-9"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131-4"
+ style="fill:#999999" /></flowRegion><flowPara
+ id="flowPara7133-0">Unlock</flowPara></flowRoot> <g
+ transform="matrix(0.01782933,0,0,-0.01782933,-69.523314,74.608964)"
+ id="g32642">
+ <g
+ transform="scale(0.190457,0.190457)"
+ id="g32644">
+ <path
+ d="m 6324.64,12784.2 -4897.39,1728.5 0,-10659.07 4897.39,1584.46 0,7346.11"
+ id="path32646"
+ style="fill:#040606;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="M 6207.08,12789.6 11292,14518 l 0,-10659.07 -5084.92,1584.46 0,7346.21"
+ id="path32648"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="m 157.305,1987.7 6049.775,2016.46 0,8786.54 -6049.775,-2016.4 0,-8786.6"
+ id="path32650"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="M 8963.77,1854.96 9821.18,444.352 10273.3,1754.73 8963.77,1854.96"
+ id="path32652"
+ style="fill:#040606;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="m 2214.36,9762.06 c -32.13,31.56 41.85,-257.85 144.81,-361.97 182.56,-184.19 325.17,-207.92 401.09,-210.97 168.02,-6.72 375.36,41.85 498.49,93.46 119.13,50.83 327.89,157.41 406.91,312.88 16.75,33.24 62.48,89.05 33.76,226.93 -21.79,106.06 -89.31,143.18 -171.63,137.3 -82.34,-5.57 -331.58,-72.04 -452.13,-109.1 -120.61,-36.6 -369.01,-112.21 -477.27,-135.68 -108.01,-23.42 -346.12,10.87 -384.03,47.15"
+ id="path32654"
+ style="fill:#040606;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="m 5266.81,6302.38 c -47.67,17.32 -1034.04,425.92 -1173.86,492.87 -114.41,55.02 -394.95,173.63 -526.94,227.5 371.79,573.25 606.49,1005.85 637.73,1071.74 57.81,120.55 451.33,890.6 460.52,938.01 8.93,48.04 20.11,225.51 11.45,267.67 -8.66,43 -152.95,-39.64 -348.85,-106.06 -196.21,-66.16 -569.1,-308.68 -713.13,-339.08 -144.54,-30.14 -606.48,-205.14 -842.86,-283.58 -236.38,-78.44 -683.52,-214.9 -867.44,-264.57 -184.2,-49.68 -344.97,-53.61 -447.98,-84.85 0,0 13.7,-144.29 41.06,-187.55 27.04,-43.27 124.49,-149.33 237.79,-178.94 113.31,-29.83 300.86,-17.85 386.29,1.68 85.37,19.85 233.28,92.09 253.12,123.65 20.06,32.08 -10.34,130.9 23.42,160.77 34.08,29.56 484.26,134.78 654.22,186.13 169.96,52.25 820.55,276.34 908.76,264.89 -27.93,-92.67 -551.25,-1129.23 -719.79,-1438.49 -168.6,-309.2 -1147.93,-1669.56 -1356.43,-1909.3 -158.25,-182.25 -541.75,-648.6 -674.59,-753.82 33.5,-9.25 270.99,11.13 314.25,37.91 269.61,166.07 718.69,725.09 863.29,895.37 429.81,504.05 807.43,1033.51 1106.87,1487.9 l 0.31,0 c 58.34,-24.31 529.99,-408.6 653.07,-493.77 123.07,-85.1 608.74,-356.08 713.96,-401.03 105.22,-45.52 509.62,-231.97 526.63,-168.86 17.01,63.64 -73.14,435.69 -120.87,453.81"
+ id="path32656"
+ style="fill:#040606;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="m 2987.55,1165.62 c 94.52,-57.76 183.77,-105.01 283.54,-152.26 199.52,-99.766 425.29,-204.778 640.56,-283.536 294.03,-110.262 588.06,-199.519 882.09,-267.777 162.77,-36.754 341.28,-68.258 514.55,-94.508 15.75,0 483.05,-57.758 577.56,-57.758 l 472.55,0 c 183.77,15.754 357.04,26.254 540.81,52.508 147.01,21 309.78,47.254 467.29,84.008 115.52,26.25 236.28,52.504 351.79,89.258 110.26,31.504 236.27,73.507 357.03,115.511 78.77,26.254 162.77,63.008 246.78,94.512 68.26,31.5 152.27,68.254 231.02,99.758 94.52,42.004 204.77,99.762 309.79,152.266 84,42.008 178.52,94.508 267.77,147.018 68.26,36.75 225.78,157.51 309.78,157.51 94.52,0 157.52,-84.01 157.52,-157.51 0,-152.268 -204.77,-199.522 -299.28,-267.78 C 9198.94,808.582 9078.18,756.078 8973.17,698.32 8763.15,588.059 8547.88,493.551 8343.11,414.793 8075.32,315.031 7781.3,220.523 7518.77,157.516 7419.01,136.516 7319.25,110.262 7219.49,94.5117 7166.98,84.0078 6620.93,0 6468.66,0 l -693.07,0 c -183.77,15.75 -378.04,36.7539 -561.8,63.0078 -162.77,26.25 -336.04,57.7542 -498.81,94.5082 -126.01,26.254 -262.52,63.007 -383.29,99.761 -210.02,57.754 -414.79,131.262 -614.31,210.02 -362.29,136.515 -740.33,315.035 -1097.36,551.313 -63.01,42 -68.26,84 -68.26,131.26 0,78.75 57.76,152.26 152.27,152.26 84.01,0 252.02,-120.76 283.52,-136.51"
+ id="path32658"
+ style="fill:#040606;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ d="m 6363.65,12811.3 0,-8820.89 c -5.25,-26.25 -15.75,-52.51 -36.75,-78.76 -10.51,-15.75 -31.51,-36.75 -47.26,-42.01 -131.26,-52.5 -6043.367,-2037.2 -6122.124,-2037.2 -63.0082,0 -120.7621,42 -152.266,110.26 0,5.25 -5.25,10.5 -5.25,21 l 0,8826.2 c 10.5,26.2 15.75,63 36.7539,84 42.0039,57.7 115.5121,68.2 162.7661,84 89.261,31.5 5912.1,1984.7 5996.11,1984.7 52.51,0 168.02,-36.8 168.02,-131.3 z M 6043.37,4121.67 320.281,2215.73 l 0,8442.87 5723.089,1905.9 0,-8442.83"
+ id="path32660"
+ style="fill:#040606;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ d="m 11451.4,14502 0,-10621.85 c -5.2,-120.76 -89.2,-173.27 -168,-173.27 -68.3,0 -561.8,168.02 -645.8,194.27 -661.58,204.77 -1328.4,409.54 -1984.71,614.31 -147.02,47.26 -299.28,94.51 -441.05,141.77 -126.01,36.75 -262.53,78.75 -388.54,120.76 -561.81,173.27 -1134.12,346.53 -1695.92,535.55 -21,5.25 -73.51,78.76 -73.51,94.51 l 0,7419.05 c 10.5,26.2 21,57.7 47.25,78.7 42.01,47.3 1842.94,645.8 2551.77,882.1 189.02,68.3 2557.01,882.1 2630.51,882.1 94.5,0 168,-68.3 168,-168 z m -320.3,-10422.33 -4762.2,1480.65 0,7114.48 4762.2,1617.2 0,-10212.33"
+ id="path32662"
+ style="fill:#040606;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ d="m 12660.1,1854.96 -6362.08,2027.81 26.62,8827.73 6335.46,-2016.5 0,-8839.04"
+ id="path32664"
+ style="fill:#040606;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="M 9078.07,10190.3 9897.73,9942 11391,4560.09 l -841.9,255.44 -302.5,1104.87 -1739.89,527.37 -374.15,-900.05 -842.19,255.49 1787.7,4387.09 z M 9452.8,8765.51 8828.36,7256.19 9976.39,6908.18 9452.8,8765.51"
+ id="path32666"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ </g>
+ </g>
+ <g
+ transform="matrix(0.52123448,0,0,0.52123448,64.391844,21.779567)"
+ id="g32786">
+ <rect
+ width="53.362736"
+ height="53.362736"
+ rx="10"
+ ry="10"
+ x="-74.61338"
+ y="99.641922"
+ id="rect32784"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <g
+ transform="matrix(2.1613739,0,0,2.1613739,-177.10888,-68.833455)"
+ id="g32776"
+ style="fill:#ffffff">
+ <g
+ transform="matrix(0.00339572,0,0,-0.00339572,24.656317,120.25305)"
+ id="g32644-2"
+ style="fill:#ffffff">
+ <g
+ id="g32770"
+ style="fill:#ffffff">
+ <path
+ d="m 9196.2196,11369.195 c -32.13,42.75 41.85,-272.424 144.81,-412.402 182.56,-247.771 325.17,-321.167 401.09,-350.658 168.02,-65.236 375.3604,-88.876 498.4904,-80.147 119.13,9.341 327.89,43.217 406.91,171.167 16.75,27.407 62.48,67.288 33.76,215.173 -21.79,113.648 -89.31,174.282 -171.63,197.072 -82.34,23.108 -331.58,43.441 -452.13,48.364 -120.6104,5.402 -369.0104,16.303 -477.2704,30.536 -108.01,14.196 -346.12,131.412 -384.03,180.895"
+ id="path32654-6"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <path
+ d="m 12248.67,6846.4459 c -47.67,33.9217 -1034.04,786.0424 -1173.86,901.6871 -114.41,94.8653 -394.95,311.1781 -526.94,411.016 371.79,443.7676 606.49,794.6293 637.73,849.6393 57.81,100.4168 451.33,733.4163 460.52,777.6259 8.93,44.9303 20.11,218.5078 11.45,263.6818 -8.66,46.017 -152.95,13.629 -348.85,15.434 -196.21,2.174 -569.1,-110.4805 -713.13,-90.7197 -144.54,20.1992 -606.4804,6.0772 -842.8604,9.9603 -236.38,3.8831 -683.52,23.1484 -867.44,37.5314 -184.2,14.471 -344.97,66.531 -447.98,71.166 0,0 13.7,-149.0614 41.06,-201.8499 27.04,-52.6873 124.49,-192.6854 237.79,-261.7537 113.31,-69.2929 300.86,-122.6305 386.29,-132.8522 85.37,-9.882 233.28,10.8454 253.12,35.4955 20.06,25.0946 -10.34,134.5018 23.42,152.6138 34.08,17.6908 484.26,-33.8717 654.2204,-41.7132 169.96,-6.9417 820.55,-9.4307 908.76,-51.6009 -27.93,-82.9435 -551.25,-937.2483 -719.79,-1187.8112 -168.6,-250.4821 -1147.9304,-1269.7735 -1356.4304,-1436.8996 -158.25,-127.1368 -541.75,-459.9262 -674.59,-518.8824 33.5,-20.917 270.99,-83.247 314.25,-71.5331 269.61,72.1736 718.69,474.7938 863.29,594.7144 429.81,354.3611 807.4304,752.3082 1106.8704,1102.4132 l 0.31,-0.1077 c 58.34,-44.6279 529.99,-593.1782 653.07,-721.2129 123.07,-127.9613 608.74,-568.0843 713.96,-649.6791 105.22,-82.1646 509.62,-409.4539 526.63,-352.2679 17.01,57.716 -73.14,461.1622 -120.87,495.9051"
+ id="path32656-0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ </g>
+ </g>
+ </g>
+ </g>
+ <path
+ d="m -51.994659,131.12694 c -0.722128,-0.79794 -0.830256,-2.42671 -0.830256,-12.50591 0,-9.86609 0.117183,-11.70565 0.788339,-12.37682 0.672372,-0.67238 2.539399,-0.78834 12.692237,-0.78834 8.589693,0 12.071505,0.16762 12.505911,0.60201 0.435128,0.43516 0.601984,3.97598 0.601984,12.77492 0,11.52157 -0.05191,12.20071 -0.970341,12.69224 -0.587904,0.31463 -5.500495,0.51932 -12.463985,0.51932 -10.497732,0 -11.565575,-0.0794 -12.323889,-0.91742 z m 8.463614,-7.23471 0.990354,-2.13209 3.256144,0 c 3.223584,0 3.264713,0.0175 4.113275,1.75584 0.47143,0.96572 0.938577,1.96578 1.038136,2.22235 0.09952,0.25658 0.54757,0.32584 0.995623,0.15392 0.70252,-0.26957 0.441979,-1.26085 -1.893024,-7.20281 -2.961136,-7.53529 -3.742697,-8.76016 -4.950114,-7.75809 -0.775259,0.6434 -5.820891,13.10663 -5.820891,14.37817 0,1.46367 1.313003,0.64407 2.270497,-1.41728 z m 1.975616,-4.51503 c -0.351872,-0.92936 1.571738,-5.64377 2.30283,-5.64377 0.695174,0 2.623771,5.13249 2.191454,5.83199 -0.421435,0.68192 -4.225146,0.52262 -4.494284,-0.1882 z m -20.299538,-4.91814 c -4.863913,-2.22214 -7.992357,-6.6341 -8.412104,-11.86336 -0.491709,-6.125598 2.290413,-11.201751 7.638445,-13.936846 7.598793,-3.886159 16.850828,-0.350238 19.815275,7.572966 1.157704,3.09425 1.345036,6.82906 0.382561,7.62784 -0.649596,0.53912 -11.211572,0.94599 -11.706602,0.45097 -0.147216,-0.14722 0.336524,-1.18074 1.075015,-2.29667 0.738489,-1.11594 1.636736,-2.88425 1.996112,-3.92959 0.444977,-1.294352 1.028815,-1.989239 1.830307,-2.178456 0.647296,-0.152785 1.176904,-0.606274 1.176904,-1.007717 0,-0.552503 -0.828193,-0.766052 -3.407587,-0.878716 -3.091317,-0.135004 -3.451015,-0.263042 -3.875524,-1.379586 -0.597101,-1.570502 -1.391775,-1.570502 -1.988875,0 -0.42451,1.116544 -0.784205,1.244569 -3.875525,1.379586 -2.628373,0.114843 -3.407586,0.320905 -3.407586,0.901324 0,0.618187 1.052224,0.77775 5.894621,0.89385 5.636216,0.135138 5.894615,0.188174 5.894615,1.210103 0,1.470272 -2.386694,5.421102 -3.274883,5.421102 -0.398333,0 -1.321819,-0.90301 -2.052198,-2.00668 -0.730373,-1.10367 -1.510383,-2.00668 -1.733353,-2.00668 -1.085447,0 -0.911627,1.26989 0.463094,3.38325 0.834667,1.28313 1.400264,2.52278 1.25688,2.75478 -0.143374,0.232 -1.493486,1.11755 -3.000233,1.96792 -2.509742,1.41641 -3.152611,2.36053 -1.893181,2.78034 0.26911,0.0897 1.826826,-0.64231 3.46156,-1.62669 4.788357,-2.8834 5.965421,-1.9906 5.670351,4.30095 l -0.152207,3.24538 -2.759178,0.12594 c -1.933064,0.0882 -3.435098,-0.18279 -5.016695,-0.90537 z"
+ id="path19435"
+ style="fill:#131313" />
+ <path
+ d="m 336.88548,487.32905 c -1.42455,-0.62014 -1.33888,-1.08005 1.12838,-6.0578 l 2.0874,-4.21136 -0.0204,-7.18882 c -0.0184,-6.46676 0.0183,-7.26514 0.36482,-7.9487 0.21189,-0.41793 0.63047,-0.8824 0.93019,-1.03216 0.78618,-0.39283 21.01124,-0.39283 21.79743,0 0.29971,0.14976 0.71819,0.61423 0.92995,1.03216 0.34628,0.68341 0.38307,1.48628 0.36559,7.97801 l -0.0194,7.21813 2.08662,4.16885 c 1.14764,2.29286 2.08662,4.37245 2.08662,4.6213 0,0.72885 -0.37788,1.23281 -1.1178,1.49075 -1.0988,0.38304 -29.72892,0.31726 -30.61933,-0.0704 z m 4.8173,-3.06734 c 0,-0.36728 -0.16787,-0.44661 -1.06578,-0.50363 -1.14602,-0.0728 -1.57931,0.15556 -1.36332,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.9795,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16787,-0.44661 -1.06579,-0.50363 -1.14601,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 11.77061,0 c 0,-0.42157 -0.16488,-0.43789 -4.99831,-0.49464 -2.95826,-0.0347 -5.08302,0.026 -5.20584,0.14883 -0.11413,0.11413 -0.14783,0.36305 -0.0749,0.55316 0.11674,0.30421 0.74075,0.33863 5.20584,0.28712 4.90837,-0.0566 5.07319,-0.0727 5.07319,-0.49447 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.28229,0.28712 0.9795,-0.0563 1.14681,-0.12957 1.14681,-0.50191 z m -22.38276,-2.77918 c 0.0602,-0.31764 -0.0922,-0.38145 -0.91165,-0.38145 -0.5412,0 -1.04462,0.0981 -1.11871,0.21797 -0.2645,0.42796 0.16319,0.676 1.0535,0.61099 0.65577,-0.0479 0.9244,-0.17095 0.97686,-0.44751 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48758,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.03349,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95028,-0.44621 z m 3.419,0.0545 c 0,-0.23542 -0.28989,-0.34557 -1.03538,-0.3934 -0.76984,-0.0494 -1.03538,0.0112 -1.03538,0.23614 0,0.49587 0.26331,0.61724 1.19095,0.54897 0.60796,-0.0447 0.87981,-0.16578 0.87981,-0.39171 z M 343.529,479.16034 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25586,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80273,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.23851,0.38591 1.72235,0.1521 1.80508,-0.28442 z m 3.20095,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.92639,-0.39399 -0.67796,-0.0491 -0.9264,0.0143 -0.9264,0.23614 0,0.48656 0.26039,0.61883 1.08209,0.54967 0.51092,-0.043 0.7707,-0.17507 0.7707,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25585,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80272,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.2385,0.38591 1.72235,0.1521 1.80507,-0.28442 z m 3.20096,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.9264,-0.39399 -0.67795,-0.0491 -0.92639,0.0143 -0.92639,0.23614 0,0.48656 0.26039,0.61883 1.08208,0.54967 0.51093,-0.043 0.77071,-0.17507 0.77071,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84534,0.67495 0.16522,0.10465 0.54562,0.19027 0.84534,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m -0.75967,-4.50733 c 0.0728,-0.18963 0.13231,-2.76936 0.13231,-5.73273 0,-3.89998 -0.0722,-5.46017 -0.26157,-5.6495 -0.37614,-0.37614 -18.7184,-0.37614 -19.09455,0 -0.18933,0.18933 -0.26157,1.74952 -0.26157,5.6495 0,2.96337 0.0595,5.5431 0.13231,5.73273 0.11786,0.30714 1.17453,0.34479 9.67654,0.34479 8.50201,0 9.55867,-0.0376 9.67653,-0.34479 z"
+ id="path21190"
+ style="fill:#181818" />
+</svg>
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.png
new file mode 100644
index 0000000..4dacedd
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.png
Binary files differ
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg
new file mode 100644
index 0000000..a554fd6
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg
@@ -0,0 +1,784 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.2"
+ width="473.45154"
+ height="363.01953"
+ id="svg2">
+ <defs
+ id="defs4" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ width="453.45154"
+ height="240.63916"
+ x="10"
+ y="63.068268"
+ id="rect22803"
+ style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+ <flowRoot
+ transform="translate(-18.044427,-38.710579)"
+ id="flowRoot4207"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion4209"><rect
+ width="738.57141"
+ height="75.714287"
+ x="-10"
+ y="869.50507"
+ id="rect4211" /></flowRegion><flowPara
+ id="flowPara4213" /></flowRoot> <flowRoot
+ transform="translate(-18.044427,-38.710579)"
+ id="flowRoot5205"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion5207"><rect
+ width="226.42857"
+ height="80"
+ x="14.285714"
+ y="71.647896"
+ id="rect5209" /></flowRegion><flowPara
+ id="flowPara5211" /></flowRoot> <flowRoot
+ transform="translate(-18.044427,-38.710579)"
+ id="flowRoot5221"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion5223"><rect
+ width="465"
+ height="152.85715"
+ x="16.428572"
+ y="70.219322"
+ id="rect5225" /></flowRegion><flowPara
+ id="flowPara5227" /></flowRoot> <flowRoot
+ transform="translate(-18.044427,-38.710579)"
+ id="flowRoot5795"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion5797"><rect
+ width="243.57143"
+ height="45.714287"
+ x="9.2857141"
+ y="195.93361"
+ id="rect5799" /></flowRegion><flowPara
+ id="flowPara5801" /></flowRoot> <flowRoot
+ transform="translate(-18.044427,-38.710579)"
+ id="flowRoot5803"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion5805"><rect
+ width="0"
+ height="13.571428"
+ x="135"
+ y="184.50504"
+ id="rect5807" /></flowRegion><flowPara
+ id="flowPara5809" /></flowRoot> <text
+ x="72.567451"
+ y="81.636963"
+ id="text4203-4"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><tspan
+ x="72.567451"
+ y="81.636963"
+ id="tspan4205-0">Administration password</tspan></text>
+ <flowRoot
+ transform="matrix(0.66433109,0,0,0.66433109,47.525322,22.746379)"
+ id="flowRoot3771-2"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3773-9"><rect
+ width="726.26373"
+ height="85.807358"
+ x="35.355339"
+ y="289.69702"
+ id="rect3775-9"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3806-1">Specific Tor configuration</flowPara><flowPara
+ id="flowPara21825" /></flowRoot> <g
+ transform="translate(-463.9595,84.107903)"
+ id="g3106">
+ <rect
+ width="50.714287"
+ height="15.714286"
+ x="480.41507"
+ y="134.34749"
+ id="rect4544-2"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="25"
+ height="10.714286"
+ x="483.98654"
+ y="136.49036"
+ id="rect4546-2"
+ style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ <text
+ x="487.55795"
+ y="146.20465"
+ id="text4548-9"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="487.55795"
+ y="146.20465"
+ id="tspan4550-6">Off</tspan></text>
+ </g>
+ <flowRoot
+ transform="matrix(0.66433109,0,0,0.66433109,47.79758,-46.411171)"
+ id="flowRoot3771-2-0"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3773-9-5"><rect
+ width="332.20215"
+ height="21.148161"
+ x="35.355339"
+ y="289.69702"
+ id="rect3775-9-6"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3806-1-1">Windows camouflage</flowPara></flowRoot> <g
+ transform="translate(-18.388097,14.393617)"
+ id="g3175">
+ <rect
+ width="50.714287"
+ height="15.714286"
+ x="34.84367"
+ y="169.63319"
+ id="rect4544-4"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="25"
+ height="10.714286"
+ x="58.415112"
+ y="171.77606"
+ id="rect4546-64"
+ style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ <text
+ x="61.986523"
+ y="181.49034"
+ id="text4548-97"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="61.986523"
+ y="181.49034"
+ id="tspan4550-4">On</tspan></text>
+ </g>
+ <flowRoot
+ transform="matrix(0.66433109,0,0,0.66433109,47.797582,-11.839743)"
+ id="flowRoot3771-2-7"
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion3773-9-0"><rect
+ width="332.20215"
+ height="21.148161"
+ x="35.355339"
+ y="289.69702"
+ id="rect3775-9-5"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara3806-1-18">MAC address spoofing</flowPara></flowRoot> <text
+ x="243.95558"
+ y="81.327232"
+ id="text5723"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="243.95558"
+ y="81.327232"
+ id="tspan5725"
+ style="fill:#0000ff">More info</tspan></text>
+ <text
+ x="214.65242"
+ y="157.34099"
+ id="text5723-9"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="214.65242"
+ y="157.34099"
+ id="tspan5725-3"
+ style="fill:#0000ff">More info</tspan></text>
+ <text
+ x="222.5096"
+ y="191.62669"
+ id="text5723-0"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="222.5096"
+ y="191.62669"
+ id="tspan5725-1"
+ style="fill:#0000ff">More info</tspan></text>
+ <text
+ x="407.93811"
+ y="225.76955"
+ id="text5723-0-6"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="407.93811"
+ y="225.76955"
+ id="tspan5725-1-1"
+ style="fill:#0000ff">More info</tspan></text>
+ <text
+ x="72.923203"
+ y="271.4281"
+ id="text4203-4-3"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><tspan
+ x="72.923203"
+ y="271.4281"
+ id="tspan4205-0-2">Persistence</tspan></text>
+ <text
+ x="153.77521"
+ y="271.90338"
+ id="text5723-6"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="153.77521"
+ y="271.90338"
+ id="tspan5725-7"
+ style="fill:#0000ff">More info</tspan></text>
+ <g
+ transform="translate(-463.9595,14.40831)"
+ id="g3106-0">
+ <rect
+ width="50.714287"
+ height="15.714286"
+ x="480.41507"
+ y="134.34749"
+ id="rect4544-2-5"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="25"
+ height="10.714286"
+ x="483.98654"
+ y="136.49036"
+ id="rect4546-2-0"
+ style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ <text
+ x="487.55795"
+ y="146.20465"
+ id="text4548-9-49"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="487.55795"
+ y="146.20465"
+ id="tspan4550-6-87">Off</tspan></text>
+ </g>
+ <rect
+ width="143.0589"
+ height="22.202259"
+ x="72.870811"
+ y="96.907127"
+ id="rect3779-4-3-6-2"
+ style="fill:none;stroke:#000000;stroke-width:0.32157761;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <g
+ transform="matrix(0.3885439,0,0,0.3885439,187.185,95.81489)"
+ id="layer1-7-3">
+ <path
+ d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z"
+ id="rect3600-8"
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+ <g
+ transform="translate(0.36363745,-0.3636359)"
+ id="g3610-2"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <g
+ id="g3598-1"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181818"
+ y="18"
+ id="rect3604-86"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="18"
+ id="rect3604-4-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="18"
+ id="rect3604-8-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="18"
+ id="rect3604-5-7"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="translate(0,-0.13636303)"
+ id="g3604-8"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181817"
+ y="28.363634"
+ id="rect3604-0-6"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="28.363634"
+ id="rect3604-4-3-4"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="28.363634"
+ id="rect3604-8-6-1"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="28.363634"
+ id="rect3604-5-1-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <rect
+ width="42.742687"
+ height="6.3790541"
+ rx="1.9672368"
+ ry="2.0048456"
+ x="10.26502"
+ y="38.719563"
+ id="rect3677-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ </g>
+ <g
+ id="g34825">
+ <rect
+ width="143.0589"
+ height="22.202259"
+ x="220.23183"
+ y="96.829269"
+ id="rect3779-4-3-6-2-0"
+ style="fill:none;stroke:#000000;stroke-width:0.32157761;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ x="228.16292"
+ y="111.50475"
+ id="text3836-4-4-8-2"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="228.16292"
+ y="111.50475"
+ id="tspan3838-7-4-3-9">Confirm</tspan></text>
+ <g
+ transform="matrix(0.3885439,0,0,0.3885439,335.04215,94.95775)"
+ id="layer1-7-3-6">
+ <path
+ d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z"
+ id="rect3600-8-5"
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+ <g
+ transform="translate(0.36363745,-0.3636359)"
+ id="g3610-2-5"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <g
+ id="g3598-1-2"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181818"
+ y="18"
+ id="rect3604-86-4"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="18"
+ id="rect3604-4-5-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="18"
+ id="rect3604-8-5-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="18"
+ id="rect3604-5-7-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="translate(0,-0.13636303)"
+ id="g3604-8-8"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="10.181817"
+ y="28.363634"
+ id="rect3604-0-6-7"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="21.818184"
+ y="28.363634"
+ id="rect3604-4-3-4-9"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="33.454552"
+ y="28.363634"
+ id="rect3604-8-6-1-8"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="8"
+ height="6.909091"
+ rx="2"
+ ry="2"
+ x="45.090912"
+ y="28.363634"
+ id="rect3604-5-1-5-2"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ <rect
+ width="42.742687"
+ height="6.3790541"
+ rx="1.9672368"
+ ry="2.0048456"
+ x="10.26502"
+ y="38.719563"
+ id="rect3677-5-2"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ </g>
+ </g>
+ <rect
+ width="89.62442"
+ height="39.190517"
+ x="374.7619"
+ y="315.38303"
+ id="rect3779-5-4-1"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ x="436.63132"
+ y="338.14227"
+ id="text3844-1"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><tspan
+ x="436.63132"
+ y="338.14227"
+ id="tspan3846-4"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold">Start</tspan></text>
+ <path
+ d="m 383.26414,348.85757 c -1.42455,-0.62014 -1.33888,-1.08005 1.12838,-6.0578 l 2.0874,-4.21136 -0.0204,-7.18882 c -0.0184,-6.46676 0.0183,-7.26514 0.36482,-7.9487 0.21189,-0.41793 0.63047,-0.8824 0.93019,-1.03216 0.78618,-0.39283 21.01124,-0.39283 21.79743,0 0.29971,0.14976 0.71819,0.61423 0.92995,1.03216 0.34628,0.68341 0.38307,1.48628 0.36559,7.97801 l -0.0194,7.21813 2.08662,4.16885 c 1.14764,2.29286 2.08662,4.37245 2.08662,4.6213 0,0.72885 -0.37788,1.23281 -1.1178,1.49075 -1.0988,0.38304 -29.72892,0.31726 -30.61933,-0.0704 z m 4.8173,-3.06734 c 0,-0.36728 -0.16787,-0.44661 -1.06578,-0.50363 -1.14602,-0.0728 -1.57931,0.15556 -1.36332,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.9795,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16787,-0.44661 -1.06579,-0.50363 -1.14601,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 11.77061,0 c 0,-0.42157 -0.16488,-0.43789 -4.99831,-0.49464 -2.95826,-0.0347 -5.08302,0.026 -5.20584,0.14883 -0.11413,0.11413 -0.14783,0.36305 -0.0749,0.55316 0.11674,0.30421 0.74075,0.33863 5.20584,0.28712 4.90837,-0.0566 5.07319,-0.0727 5.07319,-0.49447 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.28229,0.28712 0.9795,-0.0563 1.14681,-0.12957 1.14681,-0.50191 z m -22.38276,-2.77918 c 0.0602,-0.31764 -0.0922,-0.38145 -0.91165,-0.38145 -0.5412,0 -1.04462,0.0981 -1.11871,0.21797 -0.2645,0.42796 0.16319,0.676 1.0535,0.61099 0.65577,-0.0479 0.9244,-0.17095 0.97686,-0.44751 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48758,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.03349,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95028,-0.44621 z m 3.419,0.0545 c 0,-0.23542 -0.28989,-0.34557 -1.03538,-0.3934 -0.76984,-0.0494 -1.03538,0.0112 -1.03538,0.23614 0,0.49587 0.26331,0.61724 1.19095,0.54897 0.60796,-0.0447 0.87981,-0.16578 0.87981,-0.39171 z m -20.18919,-2.37669 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25586,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80273,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.23851,0.38591 1.72235,0.1521 1.80508,-0.28442 z m 3.20095,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.92639,-0.39399 -0.67796,-0.0491 -0.9264,0.0143 -0.9264,0.23614 0,0.48656 0.26039,0.61883 1.08209,0.54967 0.51092,-0.043 0.7707,-0.17507 0.7707,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25585,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80272,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.2385,0.38591 1.72235,0.1521 1.80507,-0.28442 z m 3.20096,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.9264,-0.39399 -0.67795,-0.0491 -0.92639,0.0143 -0.92639,0.23614 0,0.48656 0.26039,0.61883 1.08208,0.54967 0.51093,-0.043 0.77071,-0.17507 0.77071,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84534,0.67495 0.16522,0.10465 0.54562,0.19027 0.84534,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m -0.75967,-4.50733 c 0.0728,-0.18963 0.13231,-2.76936 0.13231,-5.73273 0,-3.89998 -0.0722,-5.46017 -0.26157,-5.6495 -0.37614,-0.37614 -18.7184,-0.37614 -19.09455,0 -0.18933,0.18933 -0.26157,1.74952 -0.26157,5.6495 0,2.96337 0.0595,5.5431 0.13231,5.73273 0.11786,0.30714 1.17453,0.34479 9.67654,0.34479 8.50201,0 9.55867,-0.0376 9.67653,-0.34479 z"
+ id="path21190"
+ style="fill:#181818" />
+ <g
+ transform="matrix(0.74350435,0,0,0.74350435,-261.44275,217.63442)"
+ id="g21732">
+ <rect
+ width="69.505913"
+ height="21.452444"
+ x="373.22256"
+ y="60.85936"
+ id="rect7125-7"
+ style="fill:#000000;fill-opacity:0.00392157;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0" />
+ <flowRoot
+ transform="translate(565.15932,-223.171)"
+ id="flowRoot7127-5"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Source Sans Pro Semi-Bold"><flowRegion
+ id="flowRegion7129-2"><rect
+ width="90.958359"
+ height="29.175323"
+ x="-183.63292"
+ y="286.60464"
+ id="rect7131-9" /></flowRegion><flowPara
+ id="flowPara7133-1">Configure</flowPara></flowRoot> </g>
+ <text
+ x="86.905151"
+ y="132.6647"
+ id="text4540-5-1"
+ xml:space="preserve"
+ style="font-size:8.48354626px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="86.905151"
+ y="132.6647"
+ id="tspan4542-2-3">Show passwords</tspan></text>
+ <rect
+ width="7.8750005"
+ height="7.7148786"
+ x="73.432343"
+ y="125.66843"
+ id="rect8465"
+ style="fill:none;stroke:#000000;stroke-width:0.50005716;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <text
+ x="78.587265"
+ y="112.06798"
+ id="text3836-4-4-8-2-6"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="78.587265"
+ y="112.06798"
+ id="tspan3838-7-4-3-9-1">Type a password</tspan></text>
+ <text
+ x="319.98428"
+ y="36.642178"
+ id="text3840-4"
+ xml:space="preserve"
+ style="font-size:17.99827576px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="319.98428"
+ y="36.642178"
+ id="tspan3842-3">Quick setup</tspan></text>
+ <text
+ x="317.22986"
+ y="52.694077"
+ id="text20391-4"
+ xml:space="preserve"
+ style="font-size:11.22351265px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="317.22986"
+ y="52.694077"
+ id="tspan20393-7">Advanced configuration</tspan></text>
+ <path
+ d="m 275.3048,55.3959 c 0.84618,-3.443932 4.50049,-8.736314 7.62296,-11.04006 3.42007,-2.523286 3.64778,-2.041177 1.29811,2.748364 -1.71227,3.49029 -4.34567,6.663916 -6.85849,8.265546 -1.80702,1.15174 -2.34081,1.15849 -2.06258,0.0262 z m 6.60936,-0.0311 c -0.37862,-0.61264 2.07203,-4.863468 3.90337,-6.770628 1.76648,-1.839584 3.51247,-2.979723 3.92751,-2.564666 0.33981,0.339789 -2.04019,4.782954 -3.37317,6.2973 -1.29572,1.472004 -3.53901,3.303594 -4.04618,3.303594 -0.136,0 -0.32123,-0.11953 -0.41153,-0.26562 z m 11.69373,-3.096284 c -0.0245,-9.503339 -7.08789,-15.402101 -18.44323,-15.402101 -2.40727,0 -3.18983,-0.103064 -3.31783,-0.436503 -0.28549,-0.74398 1.7356,-4.285003 3.50378,-6.138747 2.63366,-2.761116 5.74262,-4.03495 9.88466,-4.050028 l 2.09931,-0.0085 1.2604,-1.856036 c 3.2443,-4.77747 7.46391,-8.611877 11.70382,-10.635396 1.86038,-0.887879 7.04245,-2.488191 8.48127,-2.619186 0.60005,-0.05467 0.62133,0.101876 0.52332,3.852236 -0.0562,2.150031 -0.28805,4.826233 -0.51525,5.947085 -0.89411,4.41121 -3.46141,9.544462 -6.88823,13.772857 l -1.40836,1.737792 0.34775,1.858634 c 0.49369,2.638508 0.18876,7.097634 -0.63282,9.253863 -0.73233,1.922069 -2.58322,4.227682 -4.52033,5.630913 -1.81371,1.31386 -2.07283,1.20067 -2.07826,-0.907726 z m 5.03323,-21.877581 c 2.12953,-1.257942 2.33486,-4.019159 0.42366,-5.697219 -1.88685,-1.6567 -4.56343,-1.087742 -5.64945,1.200875 -1.41489,2.981625 2.33218,6.205645 5.22579,4.496344 z M 274.08113,48.67212 c 0.42156,-1.393165 2.05021,-4.172873 3.30063,-5.63336 1.52456,-1.780716 3.97289,-3.544114 4.36967,-3.147326 0.37705,0.377025 -1.32078,3.911817 -2.85753,5.949327 -1.97936,2.624364 -5.3502,4.607405 -4.81277,2.831359 z"
+ id="path21112"
+ style="fill:#0c0c0c" />
+ <text
+ x="60.961876"
+ y="36.301414"
+ id="text3840-4-10"
+ xml:space="preserve"
+ style="font-size:17.99827576px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="60.961876"
+ y="36.301414"
+ id="tspan3842-3-5"
+ style="fill:#808080">Welcome to Tails!</tspan></text>
+ <text
+ x="62.669075"
+ y="51.658829"
+ id="text20391-4-7"
+ xml:space="preserve"
+ style="font-size:11.22351265px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="62.669075"
+ y="51.658829"
+ id="tspan20393-7-7"
+ style="fill:#808080">Privacy for anyone anywhere</tspan></text>
+ <path
+ d="m 244.25793,26.513325 15.47641,13.365991 -14.77294,15.47641"
+ id="path22225"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ width="121.39091"
+ height="39.190517"
+ x="12.572237"
+ y="313.63235"
+ id="rect3779-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39333582;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.360015, 2.360015;stroke-dashoffset:0" />
+ <rect
+ width="120.83021"
+ height="39.190517"
+ x="150.80377"
+ y="313.63235"
+ id="rect3779-8-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39265221;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.35591326, 2.35591326;stroke-dashoffset:0" />
+ <text
+ x="49.753956"
+ y="333.43909"
+ id="text3836-4"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="49.753956"
+ y="333.43909"
+ id="tspan3838-7"
+ style="fill:#808080">Discover</tspan></text>
+ <text
+ x="185.30496"
+ y="334.2662"
+ id="text3840-4-2"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="185.30496"
+ y="334.2662"
+ id="tspan3842-3-8"
+ style="fill:#cccccc">Quick setup</tspan></text>
+ <text
+ x="50.613407"
+ y="344.22504"
+ id="text20391"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="50.613407"
+ y="344.22504"
+ id="tspan20393"
+ style="fill:#808080">Guided configuration</tspan></text>
+ <text
+ x="183.68274"
+ y="343.72003"
+ id="text20391-4-9"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="183.68274"
+ y="343.72003"
+ id="tspan20393-7-70"
+ style="fill:#cccccc">Advanced configuration</tspan></text>
+ <path
+ d="m 158.99081,345.31131 c 0.49836,-2.02832 2.65058,-5.14529 4.48957,-6.50209 2.01427,-1.4861 2.14838,-1.20216 0.76453,1.61866 -1.00845,2.05562 -2.5594,3.92474 -4.03934,4.86803 -1.06425,0.67832 -1.37863,0.6823 -1.21476,0.0154 z m 3.89261,-0.0183 c -0.22299,-0.36082 1.22033,-2.86436 2.29891,-3.98759 1.04037,-1.08343 2.06869,-1.75492 2.31313,-1.51047 0.20013,0.20012 -1.20159,2.81694 -1.98665,3.70882 -0.76312,0.86694 -2.08432,1.94567 -2.38302,1.94567 -0.0801,0 -0.18919,-0.0704 -0.24237,-0.15644 z m 6.88708,-1.82357 c -0.0144,-5.59703 -4.17445,-9.07113 -10.86223,-9.07113 -1.41777,0 -1.87866,-0.0607 -1.95405,-0.25708 -0.16814,-0.43817 1.02219,-2.52367 2.06357,-3.61544 1.5511,-1.62617 3.38214,-2.3764 5.82161,-2.38528 l 1.2364,-0.005 0.74232,-1.09312 c 1.91075,-2.81371 4.39591,-5.072 6.89302,-6.26376 1.09568,-0.52292 4.14768,-1.46543 4.99508,-1.54258 0.3534,-0.0322 0.36593,0.06 0.30821,2.26879 -0.0331,1.26627 -0.16965,2.84243 -0.30346,3.50256 -0.52659,2.598 -2.03861,5.62125 -4.05685,8.11158 l -0.82946,1.02348 0.20481,1.09465 c 0.29076,1.55396 0.11117,4.18018 -0.3727,5.4501 -0.43131,1.13201 -1.5214,2.48991 -2.66227,3.31635 -1.06819,0.7738 -1.2208,0.70714 -1.224,-0.53461 z m 2.96434,-12.88489 c 1.2542,-0.74087 1.37513,-2.3671 0.24952,-3.3554 -1.11127,-0.97572 -2.68765,-0.64063 -3.32727,0.70726 -0.8333,1.75604 1.37355,3.65484 3.07775,2.64814 z m -14.46472,10.76676 c 0.24828,-0.82051 1.20748,-2.45763 1.94392,-3.31779 0.8979,-1.04876 2.33985,-2.08732 2.57354,-1.85363 0.22206,0.22205 -0.77788,2.30388 -1.68296,3.50388 -1.16575,1.54563 -3.15102,2.71355 -2.8345,1.66754 z"
+ id="path21112-0"
+ style="fill:#cccccc" />
+ <path
+ d="m 42.089735,344.44775 c -0.28612,-0.18005 -2.76362,-2.58233 -5.50557,-5.33841 l -4.98535,-5.01105 0,-0.83411 c 0,-0.71738 0.0825,-0.91661 0.58958,-1.42368 0.50709,-0.50709 0.70627,-0.58957 1.42379,-0.58957 l 0.83423,0 5.09136,5.07205 c 2.80026,2.78964 5.20278,5.28277 5.33894,5.54031 0.44293,0.8377 0.31772,1.49655 -0.42563,2.2399 -0.77759,0.77759 -1.50463,0.88367 -2.36135,0.34456 z m -14.6526,-7.64791 c -0.46728,-0.46727 -0.48716,-2.04248 -0.0328,-2.60351 0.38133,-0.47094 1.12556,-0.50772 1.59925,-0.079 0.26504,0.23986 0.34106,0.53457 0.34106,1.3222 0,1.14564 -0.37073,1.70716 -1.12712,1.70716 -0.23843,0 -0.58958,-0.15606 -0.78032,-0.34681 z m -6.76274,-0.12419 c -0.60321,-0.21649 -1.04042,-0.80931 -1.04042,-1.41073 0,-0.52343 0.17564,-0.78309 1.26976,-1.87721 1.09412,-1.09412 1.35379,-1.26976 1.87722,-1.26976 0.41029,0 0.72143,0.12663 0.95864,0.39016 0.76076,0.84517 0.65631,1.40876 -0.49194,2.65447 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51307 z m 6.87475,-5.63105 c -2.68517,-0.57274 -3.24105,-4.29976 -0.84237,-5.6479 1.29208,-0.72619 3.18869,-0.35604 3.98767,0.77826 1.65897,2.35517 -0.3502,5.46582 -3.1453,4.86964 z m -8.08857,-2.22132 c -0.46033,-0.46033 -0.43872,-1.06703 0.0546,-1.5304 0.59757,-0.56139 2.058,-0.53452 2.64112,0.0486 0.51928,0.51929 0.53187,0.77976 0.0662,1.37173 -0.31604,0.40178 -0.48337,0.45689 -1.38723,0.45689 -0.79663,0 -1.10585,-0.078 -1.37464,-0.34681 z m 14.8312,0.005 c -0.42868,-0.47368 -0.3919,-1.21791 0.079,-1.59925 0.56104,-0.45428 2.13624,-0.43439 2.60352,0.0329 0.19074,0.19075 0.34681,0.54189 0.34681,0.78032 0,0.75639 -0.56152,1.12712 -1.70717,1.12712 -0.78763,0 -1.08233,-0.076 -1.32219,-0.34106 z m -11.88334,-4.80801 c -0.14306,-0.0512 -0.82584,-0.64778 -1.51728,-1.32585 -1.09961,-1.07833 -1.25718,-1.3111 -1.25718,-1.85722 0,-0.8127 0.57573,-1.37845 1.40274,-1.37845 0.51535,0 0.77508,0.17751 1.83951,1.25718 0.68169,0.69144 1.2613,1.41324 1.28803,1.60398 0.10285,0.7342 -0.1954,1.31831 -0.80271,1.57206 -0.32734,0.13677 -0.61718,0.24251 -0.64408,0.23499 -0.0269,-0.008 -0.16598,-0.0556 -0.30903,-0.10669 z m 10.92442,-0.004 c -0.60322,-0.21648 -1.04042,-0.8093 -1.04042,-1.41073 0,-0.90228 2.24469,-3.14696 3.14697,-3.14696 0.41029,0 0.72145,0.12663 0.95865,0.39015 0.76076,0.84517 0.65631,1.40877 -0.49194,2.65448 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51306 z m -5.8169,-2.03547 c -0.60091,-0.60091 -0.61467,-2.11077 -0.0243,-2.66541 0.50062,-0.47031 1.05489,-0.48144 1.50611,-0.0302 0.26879,0.2688 0.3468,0.57801 0.3468,1.37464 0,0.90385 -0.0551,1.07119 -0.45689,1.38723 -0.59196,0.46564 -0.85244,0.45306 -1.37173,-0.0662 z"
+ id="path21150"
+ style="fill:#808080" />
+ <g
+ transform="matrix(0.44444496,0,0,0.44444496,12.111329,7.69393)"
+ id="g5374"
+ style="fill:#808080;fill-opacity:1">
+ <path
+ d="m 88.342066,56.730068 0,16.662869 c 0,0.510289 -0.341075,0.643984 -0.760689,0.296591 L 79.077314,66.649116 C 78.658103,66.302056 78.317029,65.609 78.317029,65.098711 l 0,-2.097683 -2.657657,-2.16078 c -2.850156,-2.317289 -5.132376,-7.0217 -5.132376,-10.464763 0,-3.442323 2.29778,-4.339449 5.132376,-2.002743 l 2.657657,2.160782 0,-2.097681 c 0,-0.510046 0.341074,-0.643737 0.760285,-0.296677 l 8.503862,7.040243 c 0.420546,0.346435 0.76089,1.040613 0.76089,1.550659 z M 75.81131,51.432227 c -1.50022,-1.236708 -2.716309,-0.761675 -2.716309,1.060197 0,1.822367 1.216089,4.301887 2.716309,5.538595 l 2.505719,2.035532 0,-6.599035 -2.505719,-2.035532 z"
+ id="path5189-4"
+ style="fill:#808080;fill-opacity:1" />
+ <g
+ transform="matrix(0.46410314,0.9267926,-0.9267926,0.46410314,77.258376,-14.89278)"
+ id="g3500"
+ style="fill:#808080;fill-opacity:1">
+ <path
+ d="M 97.976,37.8 C 97.972,37.779 97.968,37.758 97.963,37.737 97.947,37.669 97.927,37.602 97.901,37.538 97.898,37.53 97.896,37.522 97.893,37.515 97.863,37.446 97.826,37.38 97.786,37.317 97.775,37.299 97.762,37.283 97.75,37.266 97.715,37.216 97.676,37.169 97.634,37.125 97.623,37.113 97.613,37.101 97.601,37.089 97.548,37.037 97.49,36.989 97.428,36.946 97.413,36.935 97.396,36.927 97.38,36.917 97.349,36.898 97.32,36.877 97.288,36.86 L 96.743,36.576 71.837016,47.695585 25.252,24.269 l -0.666,0.33 c -0.006,0.003 -0.01,0.007 -0.016,0.01 -0.047,0.024 -0.09,0.055 -0.134,0.084 -0.029,0.019 -0.06,0.036 -0.087,0.057 -0.034,0.027 -0.063,0.059 -0.094,0.09 -0.031,0.03 -0.065,0.059 -0.093,0.092 -0.022,0.026 -0.039,0.056 -0.06,0.084 -0.031,0.043 -0.063,0.086 -0.088,0.132 -0.003,0.005 -0.007,0.01 -0.01,0.015 -0.015,0.028 -0.022,0.057 -0.035,0.085 -0.02,0.046 -0.041,0.09 -0.056,0.138 -0.013,0.041 -0.02,0.082 -0.029,0.123 -0.009,0.043 -0.019,0.085 -0.024,0.128 -0.005,0.043 -0.004,0.085 -0.005,0.127 -0.001,0.044 -0.003,0.087 0.001,0.13 0.002,0.023 0.005,0.046 0.009,0.069 -0.006,0.051 -0.015,0.1 -0.015,0.152 L 23.854,41.674 27.21708,40.107419 63.622,58.211 38.537615,69.347048 l -18.939,-9.469 L 2.6090632,51.38471 c -0.012,-0.006 -0.025,-0.009 -0.038,-0.014 -0.042,-0.02 -0.086,-0.035 -0.131,-0.05 -0.04,-0.014 -0.08,-0.028 -0.121,-0.038 -0.038,-0.009 -0.078,-0.014 -0.117,-0.019 -0.049,-0.007 -0.098,-0.014 -0.148,-0.015 -0.013,0 -0.024,-0.004 -0.037,-0.004 -0.025,0 -0.049,0.006 -0.074,0.007 -0.05,0.004 -0.099,0.007 -0.148,0.016 -0.04,0.007 -0.079,0.017 -0.118,0.027 -0.043,0.011 -0.085,0.024 -0.127,0.039 -0.039,0.015 -0.077,0.032 -0.114,0.051 -0.039,0.019 -0.077,0.039 -0.115,0.062 -0.035,0.022 -0.068,0.045 -0.1,0.07 -0.035,0.027 -0.07,0.054 -0.103,0.085 -0.031,0.029 -0.059,0.059 -0.087,0.09 -0.028,0.032 -0.056,0.064 -0.082,0.099 -0.028,0.038 -0.052,0.079 -0.076,0.12 -0.013,0.023 -0.03,0.042 -0.042,0.066 -0.006,0.012 -0.008,0.025 -0.014,0.037 -0.02,0.043 -0.036,0.089 -0.051,0.135 -0.013,0.039 -0.027,0.078 -0.036,0.117 -0.009,0.04 -0.014,0.081 -0.02,0.122 -0.007,0.048 -0.013,0.095 -0.014,0.142 0.001,0.014 -0.003,0.026 -0.003,0.039 l 0,19.531 c 0,0.026 0.006,0.051 0.008,0.077 0.003,0.048 0.006,0.096 0.014,0.143 0.007,0.042 0.017,0.082 0.028,0.122 0.011,0.042 0.023,0.083 0.038,0.123 0.015,0.04 0.033,0.079 0.052,0.117 0.019,0.038 0.038,0.076 0.061,0.112 0.022,0.035 0.046,0.069 0.071,0.102 0.027,0.035 0.054,0.069 0.084,0.102 0.028,0.031 0.059,0.059 0.09,0.087 0.032,0.029 0.064,0.056 0.1,0.082 0.038,0.027 0.077,0.051 0.118,0.075 0.023,0.014 0.043,0.031 0.068,0.043 L 37.945615,91.543048 c 0.007,0.004 0.015,0.004 0.022,0.008 0.017,0.008 0.032,0.017 0.049,0.025 0.01,0.004 0.02,0.007 0.03,0.011 0.056,0.022 0.113,0.041 0.171,0.055 0.012,0.003 0.024,0.006 0.036,0.009 0.016,0.003 0.032,0.005 0.048,0.008 0.077,0.014 0.154,0.024 0.232,0.024 0.001,0 0.002,0 0.003,0 l 0.001,0 10e-4,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.156,-0.01 0.232,-0.024 0.016,-0.003 0.032,-0.005 0.048,-0.008 0.012,-0.003 0.024,-0.006 0.036,-0.009 0.058,-0.014 0.115,-0.033 0.17,-0.055 0.01,-0.004 0.021,-0.007 0.031,-0.011 0.017,-0.007 0.032,-0.017 0.049,-0.024 0.007,-0.003 0.015,-0.004 0.022,-0.008 L 61.746,81.642 l 9.462,5.221 c 0.018,0.01 0.037,0.017 0.056,0.026 0.019,0.01 0.038,0.02 0.058,0.029 0.008,0.003 0.016,0.007 0.024,0.01 0.031,0.013 0.063,0.023 0.095,0.033 0.019,0.006 0.038,0.013 0.058,0.019 0.021,0.006 0.043,0.011 0.064,0.015 0.015,0.003 0.029,0.006 0.044,0.008 0.007,0.001 0.015,0.003 0.022,0.004 0.014,0.002 0.028,0.006 0.042,0.008 0.059,0.008 0.117,0.013 0.176,0.013 l 0.001,0 0.001,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.155,-0.01 0.232,-0.024 0.013,-0.002 0.026,-0.003 0.039,-0.006 0.01,-0.002 0.019,-0.006 0.029,-0.008 0.07,-0.017 0.14,-0.037 0.207,-0.065 0.007,-0.003 0.014,-0.007 0.021,-0.01 0.004,-0.002 0.008,-0.004 0.012,-0.006 0.006,-0.003 0.012,-0.003 0.018,-0.006 L 97.238,75.317 C 97.703,75.098 98,74.631 98,74.117 L 98,38.034 C 98,38.028 97.998,38.023 97.998,38.017 97.997,37.943 97.989,37.871 97.976,37.8 z m -60.762385,40.617048 -7.614,3.666 3.972,1.986 3.641,-1.986 0,6.29 -33.8715518,-16.935338 0,-9.829 8.6775518,4.241338 -7.2569997,3.35 3.972,1.986 7.2689997,-3.378 4.313,2.051 -7.487,3.456 3.972,1.986 7.503,-3.482 4.621,2.344 -7.381,3.407 3.972,1.986 7.395,-3.434 4.303,2.111 z M 65.228,76.939 39.861615,88.216048 l 0,-16.57 L 65.228,60.37 z M 3.3410632,58.52771 l 0,-3.31 33.8725518,16.603338 0,3.31 z"
+ id="path3502"
+ style="fill:#808080;fill-opacity:1" />
+ </g>
+ <polygon
+ points="39.407,53.262 45.366,56.241 39.076,59.22 33.117,56.241 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.46318,-16.30443)"
+ id="polygon3506"
+ style="fill:#808080;fill-opacity:1" />
+ <polygon
+ points="22.855,50.613 29.145,47.634 35.103,50.613 28.814,53.593 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.02568,-16.55443)"
+ id="polygon3508"
+ style="fill:#808080;fill-opacity:1" />
+ <g
+ transform="matrix(0,-0.2492475,0.19547686,0.16114179,71.005984,62.192969)"
+ id="Captions"
+ style="fill:#808080;fill-opacity:1" />
+ <g
+ transform="translate(122.10986,-55.111168)"
+ id="Captions-7"
+ style="fill:#808080;fill-opacity:1" />
+ <path
+ d="m 45.058193,34.347585 c 2.124399,2.704098 4.295157,7.985437 4.295157,12.865587 0,4.87818 -2.170758,6.542025 -4.295157,5.703941 0,-1.998055 0,-16.795084 0,-18.569528 z"
+ id="path4818-2-4-3"
+ style="fill:#808080;fill-opacity:1" />
+ <g
+ transform="translate(74.936297,109.72221)"
+ id="Your_Icon"
+ style="fill:#808080;fill-opacity:1" />
+ </g>
+ <text
+ x="72.316605"
+ y="168.78749"
+ id="text4540-3"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="72.316605"
+ y="168.78749"
+ id="tspan4542-0">Look like windows 8.</tspan></text>
+ <text
+ x="72.316605"
+ y="203.41763"
+ id="text4540-0"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="72.316605"
+ y="203.41763"
+ id="tspan4542-2">Hide the serial number of your network interfaces.</tspan></text>
+ <text
+ x="72.995956"
+ y="93.922157"
+ id="text4540-0-9-7"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="72.995956"
+ y="93.922157"
+ id="tspan6050">Set a password if you need to perform system administration tasks.</tspan></text>
+ <text
+ x="73.28672"
+ y="284.14554"
+ id="text4540-0-9-8"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+ x="73.28672"
+ y="284.14554"
+ id="tspan5909-2">Choose which persistent features to activate.</tspan></text>
+ <path
+ d="m 390.1313,99.774117 -11.79308,12.179413 -3.37526,-5.53055 -3.90392,2.37895 4.92056,8.0315 1.52497,2.50094 2.05362,-2.09429 13.84671,-14.29402 -3.2736,-3.171943 z"
+ id="path31139"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:7;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ d="m 414.99628,99.471214 -16.08332,16.083326 3.2126,3.2126 16.08332,-16.063 -3.2126,-3.232926 z m -12.42408,0.902836 -3.2126,3.21259 15.85966,15.85967 3.2126,-3.23293 -15.85966,-15.83933 z"
+ id="path31653"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:7;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <flowRoot
+ transform="translate(74.582629,-154.49259)"
+ id="flowRoot34794"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><flowRegion
+ id="flowRegion34796"><rect
+ width="385.08987"
+ height="32.72504"
+ x="-3.044189"
+ y="383.56781"
+ id="rect34798"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans" /></flowRegion><flowPara
+ id="flowPara34802">Your Internet connection is censored, filtered, or proxied. You need to configure bridge, firewall, or proxy settings.</flowPara></flowRoot></svg>
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-flow.png
index 2fc79fe..2fc79fe 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-flow.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-flow.svg
index 5d77177..5d77177 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-flow.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-flow.svg
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.png
index 63ab662..63ab662 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.svg
index 33c9482..33c9482 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-check.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-check.svg
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.png
new file mode 100644
index 0000000..f28573c
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.png
Binary files differ
diff --git a/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg
new file mode 100644
index 0000000..10bd395
--- /dev/null
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.2"
+ width="575.24744"
+ height="425.18658"
+ id="svg10689">
+ <defs
+ id="defs10691" />
+ <metadata
+ id="metadata10694">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ width="541.02637"
+ height="294.50354"
+ x="23.573612"
+ y="65.176216"
+ id="rect22803"
+ style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+ <rect
+ width="204.95174"
+ height="44.143444"
+ x="85.102982"
+ y="108.57693"
+ id="rect6998"
+ style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <flowRoot
+ transform="matrix(2,0,0,2,625.2116,-961.92951)"
+ id="flowRoot7816"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7818"><rect
+ width="86.71035"
+ height="26.80138"
+ x="-260.13104"
+ y="539.19458"
+ id="rect7820" /></flowRegion><flowPara
+ id="flowPara7822"
+ style="font-size:10px">Home and office</flowPara></flowRoot> <rect
+ width="204.95174"
+ height="44.143444"
+ x="85.102982"
+ y="166.90933"
+ id="rect6998-9"
+ style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <flowRoot
+ transform="matrix(2,0,0,2,647.6726,-903.59711)"
+ id="flowRoot7816-3"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7818-0"><rect
+ width="86.71035"
+ height="26.80138"
+ x="-260.13104"
+ y="539.19458"
+ id="rect7820-5" /></flowRegion><flowPara
+ id="flowPara7822-7"
+ style="font-size:10px">Public place</flowPara></flowRoot> <rect
+ width="204.95174"
+ height="44.143444"
+ x="85.102982"
+ y="223.66519"
+ id="rect6998-95"
+ style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <flowRoot
+ transform="matrix(2,0,0,2,661.74,-846.84125)"
+ id="flowRoot7816-9"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7818-9"><rect
+ width="86.71035"
+ height="26.80138"
+ x="-260.13104"
+ y="539.19458"
+ id="rect7820-4" /></flowRegion><flowPara
+ id="flowPara7822-9"
+ style="font-size:10px">Web cafe</flowPara></flowRoot> <rect
+ width="204.95174"
+ height="44.143444"
+ x="85.102982"
+ y="283.5741"
+ id="rect6998-3"
+ style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <flowRoot
+ transform="matrix(2,0,0,2,674.987,-786.93227)"
+ id="flowRoot7816-6"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7818-4"><rect
+ width="86.71035"
+ height="26.80138"
+ x="-260.13104"
+ y="539.19458"
+ id="rect7820-6" /></flowRegion><flowPara
+ id="flowPara7822-8"
+ style="font-size:10px">Offline</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,524.69403,-827.10185)"
+ id="flowRoot7908"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7910"><rect
+ width="112.54063"
+ height="23.849157"
+ x="-108.69207"
+ y="496.63913"
+ id="rect7912"
+ style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
+ id="flowPara7922"
+ style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Public place</flowPara><flowPara
+ id="flowPara7924"
+ style="font-size:4px;text-align:justify;text-anchor:start">You are connecting to the Internet for the first time in this location or you need to hide your MAC Address</flowPara><flowPara
+ id="flowPara7926"
+ style="font-size:4px;text-align:justify;text-anchor:start">Affected options: MAC Spoofing ON, Camouflage ON</flowPara><flowPara
+ id="flowPara7928"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7946"
+ style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,526.73517,-704.02213)"
+ id="flowRoot7908-8"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7910-3"><rect
+ width="109.75365"
+ height="23.849157"
+ x="-108.69207"
+ y="496.63913"
+ id="rect7912-6"
+ style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
+ id="flowPara7938-7"
+ style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Offline</flowPara><flowPara
+ id="flowPara7940-1"
+ style="font-size:4px;text-align:justify;text-anchor:start">You don't want to connect to the Internet.</flowPara><flowPara
+ id="flowPara7946-79"
+ style="font-size:4px;text-align:justify;text-anchor:start">Affected options: Network: OFF, Camouflage: OFF</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,525.45931,-785.36421)"
+ id="flowRoot7908-4"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7910-9"><rect
+ width="110.86845"
+ height="40.013618"
+ x="-108.69207"
+ y="496.63913"
+ id="rect7912-4"
+ style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
+ id="flowPara7928-1"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7930-00"
+ style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Web cafe</flowPara><flowPara
+ id="flowPara7932-8"
+ style="font-size:4px;text-align:justify;text-anchor:start">You are in an Internet cafe and don't want the network administrator to notice an unknown MAC Address connection</flowPara><flowPara
+ id="flowPara7934-8"
+ style="font-size:4px;text-align:justify;text-anchor:start">Affected options: MAC Spoofing: OFF, Camouflage: ON</flowPara><flowPara
+ id="flowPara7936-22"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7942-4"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7944-2"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7946-2"
+ style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,526.30621,-886.48559)"
+ id="flowRoot7908-6"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion7910-0"><rect
+ width="110.86845"
+ height="32.210087"
+ x="-108.69207"
+ y="496.63913"
+ id="rect7912-5"
+ style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
+ id="flowPara7914-92"
+ style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Home &amp; office</flowPara><flowPara
+ id="flowPara7916-2"
+ style="font-size:4px;text-align:justify;text-anchor:start">You have previously connected to the Internet from thos location and don't need to hide your MAC address</flowPara><flowPara
+ id="flowPara7918-9"
+ style="font-size:4px;text-align:justify;text-anchor:start">Affected options : MAC Spoofing OFF, Camouflage OFF</flowPara><flowPara
+ id="flowPara7920-63"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7944-5"
+ style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
+ id="flowPara7946-22"
+ style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,644.694,-895.10193)"
+ id="flowRoot9330"
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion9332"><rect
+ width="79.150124"
+ height="22.853205"
+ x="-166.66118"
+ y="615.92169"
+ id="rect9334" /></flowRegion><flowPara
+ id="flowPara9336"
+ style="font-size:4px;fill:#0000ff;fill-opacity:1">More info</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,637.38069,-916.55455)"
+ id="flowRoot8410-1"
+ xml:space="preserve"
+ style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion8412-6"><rect
+ width="56.755863"
+ height="15.765518"
+ x="-297.18002"
+ y="496.62769"
+ id="rect8414-9"
+ style="font-size:6px" /></flowRegion><flowPara
+ id="flowPara8416-9">1. Introduction</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,765.96569,-915.55064)"
+ id="flowRoot8410-0-29"
+ xml:space="preserve"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
+ id="flowRegion8412-9-2"><rect
+ width="56.755863"
+ height="15.765518"
+ x="-297.18002"
+ y="496.62769"
+ id="rect8414-7-4"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
+ id="flowPara8471-27"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold">2. Context</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,1046.9427,-915.74948)"
+ id="flowRoot8410-3-0"
+ xml:space="preserve"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#999999;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><flowRegion
+ id="flowRegion8412-3-4"><rect
+ width="56.755863"
+ height="15.765518"
+ x="-297.18002"
+ y="496.62769"
+ id="rect8414-4-8"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#999999;font-family:Sans;-inkscape-font-specification:Sans" /></flowRegion><flowPara
+ id="flowPara8416-8-4"
+ style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#999999;font-family:Sans;-inkscape-font-specification:Sans">4. Check and go</flowPara></flowRoot> <flowRoot
+ transform="matrix(2,0,0,2,866.77089,-915.60186)"
+ id="flowRoot8410-37-87"
+ xml:space="preserve"
+ style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#999999;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+ id="flowRegion8412-0-07"><rect
+ width="68.920967"
+ height="9.8497696"
+ x="-297.18002"
+ y="496.62769"
+ id="rect8414-45-31"
+ style="font-size:6px;fill:#999999" /></flowRegion><flowPara
+ id="flowPara8416-5-3">3. Need to save data?</flowPara></flowRoot> <text
+ x="70.985962"
+ y="34.301411"
+ id="text3840-4-10"
+ xml:space="preserve"
+ style="font-size:17.99827576px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="70.985962"
+ y="34.301411"
+ id="tspan3842-3-5"
+ style="fill:#666666">Welcome to Tails!</tspan></text>
+ <path
+ d="m 259.5625,20.875 -1.9375,2.28125 14.28125,12.3125 -13.6875,14.34375 2.15625,2.0625 14.78125,-15.46875 1.09375,-1.125 -1.1875,-1.03125 -15.5,-13.375 z"
+ id="path22225"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <text
+ x="363.66287"
+ y="37.029861"
+ id="text3836-4"
+ xml:space="preserve"
+ style="font-size:18.62428665px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="363.66287"
+ y="37.029861"
+ id="tspan3838-7">Discover</tspan></text>
+ <text
+ x="365.17294"
+ y="55.980583"
+ id="text20391"
+ xml:space="preserve"
+ style="font-size:11.61388493px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="365.17294"
+ y="55.980583"
+ id="tspan20393">Guided configuration</tspan></text>
+ <path
+ d="m 350.19698,56.371839 c -0.5027,-0.316345 -4.85563,-4.537108 -9.67318,-9.379491 l -8.75917,-8.804324 0,-1.465517 c 0,-1.260423 0.14495,-1.610467 1.03588,-2.50138 0.89095,-0.890948 1.2409,-1.035864 2.50157,-1.035864 l 1.46573,0 8.94543,8.911501 c 4.92,4.901347 9.14119,9.281732 9.38042,9.734225 0.77822,1.471824 0.55823,2.629411 -0.74783,3.935464 -1.36621,1.366212 -2.6436,1.552592 -4.14885,0.605386 z M 324.45263,42.934598 c -0.821,-0.820985 -0.85593,-3.5886 -0.0576,-4.57432 0.66999,-0.827433 1.97759,-0.892055 2.80985,-0.138801 0.46567,0.421429 0.59924,0.939229 0.59924,2.323081 0,2.012869 -0.65137,2.99945 -1.98033,2.99945 -0.41892,0 -1.03588,-0.274195 -1.37101,-0.609339 z m -11.88201,-0.218199 c -1.05983,-0.380369 -1.828,-1.421943 -1.828,-2.478627 0,-0.919658 0.30859,-1.375876 2.23094,-3.298225 1.92235,-1.922349 2.37859,-2.230945 3.29825,-2.230945 0.72087,0 1.26753,0.222486 1.68431,0.685504 1.33664,1.484948 1.15312,2.475166 -0.86433,4.663856 -2.00349,2.173527 -3.46985,3.035731 -4.52117,2.658437 z m 12.07881,-9.893654 c -4.7178,-1.006294 -5.69447,-7.554601 -1.48003,-9.923259 2.27016,-1.275902 5.60247,-0.625555 7.00627,1.367389 2.91478,4.137992 -0.6153,9.603348 -5.52624,8.55587 z m -14.21147,-3.902819 c -0.80879,-0.808792 -0.77083,-1.874753 0.0959,-2.688885 1.04992,-0.986353 3.61587,-0.939142 4.6404,0.08539 0.91236,0.912383 0.93449,1.370024 0.11631,2.410105 -0.55528,0.70592 -0.84927,0.802747 -2.43734,0.802747 -1.39966,0 -1.94296,-0.137044 -2.41521,-0.609339 z m 26.05815,0.0088 c -0.75318,-0.832247 -0.68856,-2.139846 0.1388,-2.809854 0.98574,-0.798161 3.75334,-0.763215 4.57434,0.05781 0.33513,0.335144 0.60934,0.952091 0.60934,1.371008 0,1.328964 -0.98658,1.98033 -2.99947,1.98033 -1.38385,0 -1.90163,-0.133531 -2.32306,-0.599236 z m -20.87882,-8.447587 c -0.25135,-0.08996 -1.45098,-1.138138 -2.66583,-2.329495 -1.93199,-1.894606 -2.20884,-2.303579 -2.20884,-3.263102 0,-1.427899 1.01155,-2.421912 2.46459,-2.421912 0.90546,0 1.3618,0.311882 3.23198,2.208843 1.19772,1.214847 2.21608,2.483037 2.26305,2.818164 0.1807,1.289976 -0.34332,2.316247 -1.41035,2.762081 -0.57513,0.240302 -1.08437,0.426086 -1.13164,0.412873 -0.0473,-0.01406 -0.29162,-0.09769 -0.54296,-0.187452 z m 19.19401,-0.007 c -1.05984,-0.380352 -1.828,-1.421926 -1.828,-2.478627 0,-1.58529 3.94388,-5.529153 5.52917,-5.529153 0.72088,0 1.26758,0.222487 1.68434,0.685487 1.33664,1.484948 1.15312,2.475184 -0.86433,4.663874 -2.00349,2.173527 -3.46985,3.035731 -4.52118,2.658419 z m -10.22018,-3.576284 c -1.05579,-1.055788 -1.07997,-3.708585 -0.0427,-4.683078 0.87958,-0.826326 1.85342,-0.845881 2.64621,-0.05306 0.47226,0.472277 0.60932,1.015554 0.60932,2.415218 0,1.588048 -0.0968,1.882062 -0.80275,2.437338 -1.04006,0.818121 -1.49772,0.796019 -2.4101,-0.116312 z"
+ id="path21150"
+ style="fill:#101010" />
+ <rect
+ width="89.62442"
+ height="39.190517"
+ x="475.12302"
+ y="374.23901"
+ id="rect3779-5-4-1"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ x="536.99249"
+ y="396.99826"
+ id="text3844-1"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><tspan
+ x="536.99249"
+ y="396.99826"
+ id="tspan3846-4"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold">Start</tspan></text>
+ <path
+ d="m 483.62527,407.71358 c -1.42455,-0.62014 -1.33888,-1.08005 1.12838,-6.0578 l 2.0874,-4.21136 -0.0204,-7.18882 c -0.0184,-6.46676 0.0183,-7.26514 0.36482,-7.9487 0.21189,-0.41793 0.63047,-0.8824 0.93019,-1.03216 0.78618,-0.39283 21.01124,-0.39283 21.79743,0 0.29971,0.14976 0.71819,0.61423 0.92995,1.03216 0.34628,0.68341 0.38307,1.48628 0.36559,7.97801 l -0.0194,7.21813 2.08662,4.16885 c 1.14764,2.29286 2.08662,4.37245 2.08662,4.6213 0,0.72885 -0.37788,1.23281 -1.1178,1.49075 -1.0988,0.38304 -29.72892,0.31726 -30.61933,-0.0704 z m 4.8173,-3.06734 c 0,-0.36728 -0.16787,-0.44661 -1.06578,-0.50363 -1.14602,-0.0728 -1.57931,0.15556 -1.36332,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.9795,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16787,-0.44661 -1.06579,-0.50363 -1.14601,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.106,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 11.77061,0 c 0,-0.42157 -0.16488,-0.43789 -4.99831,-0.49464 -2.95826,-0.0347 -5.08302,0.026 -5.20584,0.14883 -0.11413,0.11413 -0.14783,0.36305 -0.0749,0.55316 0.11674,0.30421 0.74075,0.33863 5.20584,0.28712 4.90837,-0.0566 5.07319,-0.0727 5.07319,-0.49447 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.2823,0.28712 0.97949,-0.0563 1.1468,-0.12957 1.1468,-0.50191 z m 3.92354,0 c 0,-0.36728 -0.16788,-0.44661 -1.06579,-0.50363 -1.14602,-0.0728 -1.5793,0.15556 -1.36331,0.71842 0.10599,0.27622 0.38518,0.33873 1.28229,0.28712 0.9795,-0.0563 1.14681,-0.12957 1.14681,-0.50191 z m -22.38276,-2.77918 c 0.0602,-0.31764 -0.0922,-0.38145 -0.91165,-0.38145 -0.5412,0 -1.04462,0.0981 -1.11871,0.21797 -0.2645,0.42796 0.16319,0.676 1.0535,0.61099 0.65577,-0.0479 0.9244,-0.17095 0.97686,-0.44751 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10585,0.0866 -1.10585,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63102,-0.0465 0.89827,-0.17203 0.95028,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48759,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.0335,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26918,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95029,-0.44621 z m 3.48758,0 c 0.0612,-0.32267 -0.0981,-0.38145 -1.03349,-0.38145 -0.77623,0 -1.10586,0.0866 -1.10586,0.29063 0,0.48331 0.26917,0.60487 1.18907,0.53703 0.63103,-0.0465 0.89828,-0.17203 0.95028,-0.44621 z m 3.419,0.0545 c 0,-0.23542 -0.28989,-0.34557 -1.03538,-0.3934 -0.76984,-0.0494 -1.03538,0.0112 -1.03538,0.23614 0,0.49587 0.26331,0.61724 1.19095,0.54897 0.60796,-0.0447 0.87981,-0.16578 0.87981,-0.39171 z m -20.18919,-2.37669 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25586,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80273,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.23851,0.38591 1.72235,0.1521 1.80508,-0.28442 z m 3.20095,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.92639,-0.39399 -0.67796,-0.0491 -0.9264,0.0143 -0.9264,0.23614 0,0.48656 0.26039,0.61883 1.08209,0.54967 0.51092,-0.043 0.7707,-0.17507 0.7707,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84533,0.67495 0.16521,0.10465 0.54561,0.19027 0.84533,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m 3.25585,-0.2935 c 0.0591,-0.31195 -0.0872,-0.38145 -0.80272,-0.38145 -0.8872,0 -1.26058,0.24804 -1.00235,0.66587 0.2385,0.38591 1.72235,0.1521 1.80507,-0.28442 z m 3.20096,0.0545 c 0,-0.22883 -0.27804,-0.34708 -0.9264,-0.39399 -0.67795,-0.0491 -0.92639,0.0143 -0.92639,0.23614 0,0.48656 0.26039,0.61883 1.08208,0.54967 0.51093,-0.043 0.77071,-0.17507 0.77071,-0.39182 z m 3.13406,0.239 c 0.50064,-0.3171 0.0525,-0.67495 -0.84533,-0.67495 -0.89779,0 -1.34598,0.35785 -0.84534,0.67495 0.16522,0.10465 0.54562,0.19027 0.84534,0.19027 0.29971,0 0.68011,-0.0856 0.84533,-0.19027 z m -0.75967,-4.50733 c 0.0728,-0.18963 0.13231,-2.76936 0.13231,-5.73273 0,-3.89998 -0.0722,-5.46017 -0.26157,-5.6495 -0.37614,-0.37614 -18.7184,-0.37614 -19.09455,0 -0.18933,0.18933 -0.26157,1.74952 -0.26157,5.6495 0,2.96337 0.0595,5.5431 0.13231,5.73273 0.11786,0.30714 1.17453,0.34479 9.67654,0.34479 8.50201,0 9.55867,-0.0376 9.67653,-0.34479 z"
+ id="path21190"
+ style="fill:#181818" />
+ <rect
+ width="121.39091"
+ height="39.190517"
+ x="24.503674"
+ y="375.79938"
+ id="rect3779-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39333582;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.360015, 2.360015;stroke-dashoffset:0" />
+ <rect
+ width="120.83021"
+ height="39.190517"
+ x="162.73523"
+ y="375.79938"
+ id="rect3779-8-4-3"
+ style="fill:none;stroke:#000000;stroke-width:0.39265221;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.35591326, 2.35591326;stroke-dashoffset:0" />
+ <text
+ x="61.68539"
+ y="395.60611"
+ id="text3836-4-8"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="61.68539"
+ y="395.60611"
+ id="tspan3838-7-2"
+ style="fill:#cccccc">Discover</tspan></text>
+ <text
+ x="197.23642"
+ y="396.43323"
+ id="text3840-4"
+ xml:space="preserve"
+ style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="197.23642"
+ y="396.43323"
+ id="tspan3842-3"
+ style="fill:#808080">Quick setup</tspan></text>
+ <text
+ x="62.544857"
+ y="406.39206"
+ id="text20391-3"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="62.544857"
+ y="406.39206"
+ id="tspan20393-5"
+ style="fill:#cccccc">Guided configuration</tspan></text>
+ <text
+ x="195.6142"
+ y="405.88705"
+ id="text20391-4"
+ xml:space="preserve"
+ style="font-size:6.61013317px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="195.6142"
+ y="405.88705"
+ id="tspan20393-7"
+ style="fill:#808080">Advanced configuration</tspan></text>
+ <path
+ d="m 170.92224,407.47832 c 0.49836,-2.02832 2.65058,-5.14529 4.48957,-6.50209 2.01427,-1.4861 2.14838,-1.20216 0.76453,1.61866 -1.00845,2.05562 -2.5594,3.92474 -4.03934,4.86803 -1.06425,0.67832 -1.37863,0.6823 -1.21476,0.0154 z m 3.89261,-0.0183 c -0.22299,-0.36082 1.22033,-2.86436 2.29891,-3.98759 1.04037,-1.08343 2.06869,-1.75492 2.31313,-1.51047 0.20013,0.20012 -1.20159,2.81694 -1.98665,3.70882 -0.76312,0.86694 -2.08432,1.94567 -2.38302,1.94567 -0.0801,0 -0.18919,-0.0704 -0.24237,-0.15644 z m 6.88708,-1.82357 c -0.0144,-5.59703 -4.17445,-9.07113 -10.86223,-9.07113 -1.41777,0 -1.87866,-0.0607 -1.95405,-0.25708 -0.16814,-0.43817 1.02219,-2.52367 2.06357,-3.61544 1.5511,-1.62617 3.38214,-2.3764 5.82161,-2.38528 l 1.2364,-0.005 0.74232,-1.09312 c 1.91075,-2.81371 4.39591,-5.072 6.89302,-6.26376 1.09568,-0.52292 4.14768,-1.46543 4.99508,-1.54258 0.3534,-0.0322 0.36593,0.06 0.30821,2.26879 -0.0331,1.26627 -0.16965,2.84243 -0.30346,3.50256 -0.52659,2.598 -2.03861,5.62125 -4.05685,8.11158 l -0.82946,1.02348 0.20481,1.09465 c 0.29076,1.55396 0.11117,4.18018 -0.3727,5.4501 -0.43131,1.13201 -1.5214,2.48991 -2.66227,3.31635 -1.06819,0.7738 -1.2208,0.70714 -1.224,-0.53461 z m 2.96434,-12.88489 c 1.2542,-0.74087 1.37513,-2.3671 0.24952,-3.3554 -1.11127,-0.97572 -2.68765,-0.64063 -3.32727,0.70726 -0.8333,1.75604 1.37355,3.65484 3.07775,2.64814 z m -14.46472,10.76676 c 0.24828,-0.82051 1.20748,-2.45763 1.94392,-3.31779 0.8979,-1.04876 2.33985,-2.08732 2.57354,-1.85363 0.22206,0.22205 -0.77788,2.30388 -1.68296,3.50388 -1.16575,1.54563 -3.15102,2.71355 -2.8345,1.66754 z"
+ id="path21112"
+ style="fill:#808080" />
+ <path
+ d="m 54.021178,406.61476 c -0.28612,-0.18005 -2.76362,-2.58233 -5.50557,-5.33841 l -4.98535,-5.01105 0,-0.83411 c 0,-0.71738 0.0825,-0.91661 0.58958,-1.42368 0.50709,-0.50709 0.70627,-0.58957 1.42379,-0.58957 l 0.83423,0 5.09136,5.07205 c 2.80026,2.78964 5.20278,5.28277 5.33894,5.54031 0.44293,0.8377 0.31772,1.49655 -0.42563,2.2399 -0.77759,0.77759 -1.50463,0.88367 -2.36135,0.34456 z m -14.6526,-7.64791 c -0.46728,-0.46727 -0.48716,-2.04248 -0.0328,-2.60351 0.38133,-0.47094 1.12556,-0.50772 1.59925,-0.079 0.26504,0.23986 0.34106,0.53457 0.34106,1.3222 0,1.14564 -0.37073,1.70716 -1.12712,1.70716 -0.23843,0 -0.58958,-0.15606 -0.78032,-0.34681 z m -6.76274,-0.12419 c -0.60321,-0.21649 -1.04042,-0.80931 -1.04042,-1.41073 0,-0.52343 0.17564,-0.78309 1.26976,-1.87721 1.09412,-1.09412 1.35379,-1.26976 1.87722,-1.26976 0.41029,0 0.72143,0.12663 0.95864,0.39016 0.76076,0.84517 0.65631,1.40876 -0.49194,2.65447 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51307 z m 6.87475,-5.63105 c -2.68517,-0.57274 -3.24105,-4.29976 -0.84237,-5.6479 1.29208,-0.72619 3.18869,-0.35604 3.98767,0.77826 1.65897,2.35517 -0.3502,5.46582 -3.1453,4.86964 z m -8.08857,-2.22132 c -0.46033,-0.46033 -0.43872,-1.06703 0.0546,-1.5304 0.59757,-0.56139 2.058,-0.53452 2.64112,0.0486 0.51928,0.51929 0.53187,0.77976 0.0662,1.37173 -0.31604,0.40178 -0.48337,0.45689 -1.38723,0.45689 -0.79663,0 -1.10585,-0.078 -1.37464,-0.34681 z m 14.8312,0.005 c -0.42868,-0.47368 -0.3919,-1.21791 0.079,-1.59925 0.56104,-0.45428 2.13624,-0.43439 2.60352,0.0329 0.19074,0.19075 0.34681,0.54189 0.34681,0.78032 0,0.75639 -0.56152,1.12712 -1.70717,1.12712 -0.78763,0 -1.08233,-0.076 -1.32219,-0.34106 z m -11.88334,-4.80801 c -0.14306,-0.0512 -0.82584,-0.64778 -1.51728,-1.32585 -1.09961,-1.07833 -1.25718,-1.3111 -1.25718,-1.85722 0,-0.8127 0.57573,-1.37845 1.40274,-1.37845 0.51535,0 0.77508,0.17751 1.83951,1.25718 0.68169,0.69144 1.2613,1.41324 1.28803,1.60398 0.10285,0.7342 -0.1954,1.31831 -0.80271,1.57206 -0.32734,0.13677 -0.61718,0.24251 -0.64408,0.23499 -0.0269,-0.008 -0.16598,-0.0556 -0.30903,-0.10669 z m 10.92442,-0.004 c -0.60322,-0.21648 -1.04042,-0.8093 -1.04042,-1.41073 0,-0.90228 2.24469,-3.14696 3.14697,-3.14696 0.41029,0 0.72145,0.12663 0.95865,0.39015 0.76076,0.84517 0.65631,1.40877 -0.49194,2.65448 -1.1403,1.23708 -1.97489,1.72781 -2.57326,1.51306 z m -5.8169,-2.03547 c -0.60091,-0.60091 -0.61467,-2.11077 -0.0243,-2.66541 0.50062,-0.47031 1.05489,-0.48144 1.50611,-0.0302 0.26879,0.2688 0.3468,0.57801 0.3468,1.37464 0,0.90385 -0.0551,1.07119 -0.45689,1.38723 -0.59196,0.46564 -0.85244,0.45306 -1.37173,-0.0662 z"
+ id="path21150-9"
+ style="fill:#e6e6e6" />
+ <path
+ d="m 425.79633,77.963389 -0.96415,1.135209 7.10671,6.127016 -6.81125,7.137819 1.07301,1.026354 7.35553,-7.697649 0.54427,-0.559829 -0.59093,-0.513176 -7.71319,-6.655744 z"
+ id="path22225-3"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ d="m 254.85218,77.963389 -0.96415,1.135209 7.10672,6.127016 -6.81126,7.137819 1.07301,1.026354 7.35553,-7.697649 0.54428,-0.559829 -0.59093,-0.513176 -7.7132,-6.655744 z"
+ id="path22225-5"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ d="m 149.26392,77.05139 -0.96415,1.135209 7.10672,6.127016 -6.81125,7.137819 1.073,1.026353 7.35553,-7.697648 0.54428,-0.559829 -0.59093,-0.513176 -7.7132,-6.655744 z"
+ id="path22225-7"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <text
+ x="71.03952"
+ y="51.822609"
+ id="text20391-4-7"
+ xml:space="preserve"
+ style="font-size:11.22351265px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
+ x="71.03952"
+ y="51.822609"
+ id="tspan20393-7-7"
+ style="fill:#666666">Privacy for anyone anywhere</tspan></text>
+ <g
+ transform="matrix(0.40502837,0,0,0.40502837,24.571054,10.423168)"
+ id="g5374"
+ style="fill:#666666;fill-opacity:1">
+ <path
+ d="m 88.342066,56.730068 0,16.662869 c 0,0.510289 -0.341075,0.643984 -0.760689,0.296591 L 79.077314,66.649116 C 78.658103,66.302056 78.317029,65.609 78.317029,65.098711 l 0,-2.097683 -2.657657,-2.16078 c -2.850156,-2.317289 -5.132376,-7.0217 -5.132376,-10.464763 0,-3.442323 2.29778,-4.339449 5.132376,-2.002743 l 2.657657,2.160782 0,-2.097681 c 0,-0.510046 0.341074,-0.643737 0.760285,-0.296677 l 8.503862,7.040243 c 0.420546,0.346435 0.76089,1.040613 0.76089,1.550659 z M 75.81131,51.432227 c -1.50022,-1.236708 -2.716309,-0.761675 -2.716309,1.060197 0,1.822367 1.216089,4.301887 2.716309,5.538595 l 2.505719,2.035532 0,-6.599035 -2.505719,-2.035532 z"
+ id="path5189-4"
+ style="fill:#666666;fill-opacity:1" />
+ <g
+ transform="matrix(0.46410314,0.9267926,-0.9267926,0.46410314,77.258376,-14.89278)"
+ id="g3500"
+ style="fill:#666666;fill-opacity:1">
+ <path
+ d="M 97.976,37.8 C 97.972,37.779 97.968,37.758 97.963,37.737 97.947,37.669 97.927,37.602 97.901,37.538 97.898,37.53 97.896,37.522 97.893,37.515 97.863,37.446 97.826,37.38 97.786,37.317 97.775,37.299 97.762,37.283 97.75,37.266 97.715,37.216 97.676,37.169 97.634,37.125 97.623,37.113 97.613,37.101 97.601,37.089 97.548,37.037 97.49,36.989 97.428,36.946 97.413,36.935 97.396,36.927 97.38,36.917 97.349,36.898 97.32,36.877 97.288,36.86 L 96.743,36.576 71.837016,47.695585 25.252,24.269 l -0.666,0.33 c -0.006,0.003 -0.01,0.007 -0.016,0.01 -0.047,0.024 -0.09,0.055 -0.134,0.084 -0.029,0.019 -0.06,0.036 -0.087,0.057 -0.034,0.027 -0.063,0.059 -0.094,0.09 -0.031,0.03 -0.065,0.059 -0.093,0.092 -0.022,0.026 -0.039,0.056 -0.06,0.084 -0.031,0.043 -0.063,0.086 -0.088,0.132 -0.003,0.005 -0.007,0.01 -0.01,0.015 -0.015,0.028 -0.022,0.057 -0.035,0.085 -0.02,0.046 -0.041,0.09 -0.056,0.138 -0.013,0.041 -0.02,0.082 -0.029,0.123 -0.009,0.043 -0.019,0.085 -0.024,0.128 -0.005,0.043 -0.004,0.085 -0.005,0.127 -0.001,0.044 -0.003,0.087 0.001,0.13 0.002,0.023 0.005,0.046 0.009,0.069 -0.006,0.051 -0.015,0.1 -0.015,0.152 L 23.854,41.674 27.21708,40.107419 63.622,58.211 38.537615,69.347048 l -18.939,-9.469 L 2.6090632,51.38471 c -0.012,-0.006 -0.025,-0.009 -0.038,-0.014 -0.042,-0.02 -0.086,-0.035 -0.131,-0.05 -0.04,-0.014 -0.08,-0.028 -0.121,-0.038 -0.038,-0.009 -0.078,-0.014 -0.117,-0.019 -0.049,-0.007 -0.098,-0.014 -0.148,-0.015 -0.013,0 -0.024,-0.004 -0.037,-0.004 -0.025,0 -0.049,0.006 -0.074,0.007 -0.05,0.004 -0.099,0.007 -0.148,0.016 -0.04,0.007 -0.079,0.017 -0.118,0.027 -0.043,0.011 -0.085,0.024 -0.127,0.039 -0.039,0.015 -0.077,0.032 -0.114,0.051 -0.039,0.019 -0.077,0.039 -0.115,0.062 -0.035,0.022 -0.068,0.045 -0.1,0.07 -0.035,0.027 -0.07,0.054 -0.103,0.085 -0.031,0.029 -0.059,0.059 -0.087,0.09 -0.028,0.032 -0.056,0.064 -0.082,0.099 -0.028,0.038 -0.052,0.079 -0.076,0.12 -0.013,0.023 -0.03,0.042 -0.042,0.066 -0.006,0.012 -0.008,0.025 -0.014,0.037 -0.02,0.043 -0.036,0.089 -0.051,0.135 -0.013,0.039 -0.027,0.078 -0.036,0.117 -0.009,0.04 -0.014,0.081 -0.02,0.122 -0.007,0.048 -0.013,0.095 -0.014,0.142 0.001,0.014 -0.003,0.026 -0.003,0.039 l 0,19.531 c 0,0.026 0.006,0.051 0.008,0.077 0.003,0.048 0.006,0.096 0.014,0.143 0.007,0.042 0.017,0.082 0.028,0.122 0.011,0.042 0.023,0.083 0.038,0.123 0.015,0.04 0.033,0.079 0.052,0.117 0.019,0.038 0.038,0.076 0.061,0.112 0.022,0.035 0.046,0.069 0.071,0.102 0.027,0.035 0.054,0.069 0.084,0.102 0.028,0.031 0.059,0.059 0.09,0.087 0.032,0.029 0.064,0.056 0.1,0.082 0.038,0.027 0.077,0.051 0.118,0.075 0.023,0.014 0.043,0.031 0.068,0.043 L 37.945615,91.543048 c 0.007,0.004 0.015,0.004 0.022,0.008 0.017,0.008 0.032,0.017 0.049,0.025 0.01,0.004 0.02,0.007 0.03,0.011 0.056,0.022 0.113,0.041 0.171,0.055 0.012,0.003 0.024,0.006 0.036,0.009 0.016,0.003 0.032,0.005 0.048,0.008 0.077,0.014 0.154,0.024 0.232,0.024 0.001,0 0.002,0 0.003,0 l 0.001,0 10e-4,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.156,-0.01 0.232,-0.024 0.016,-0.003 0.032,-0.005 0.048,-0.008 0.012,-0.003 0.024,-0.006 0.036,-0.009 0.058,-0.014 0.115,-0.033 0.17,-0.055 0.01,-0.004 0.021,-0.007 0.031,-0.011 0.017,-0.007 0.032,-0.017 0.049,-0.024 0.007,-0.003 0.015,-0.004 0.022,-0.008 L 61.746,81.642 l 9.462,5.221 c 0.018,0.01 0.037,0.017 0.056,0.026 0.019,0.01 0.038,0.02 0.058,0.029 0.008,0.003 0.016,0.007 0.024,0.01 0.031,0.013 0.063,0.023 0.095,0.033 0.019,0.006 0.038,0.013 0.058,0.019 0.021,0.006 0.043,0.011 0.064,0.015 0.015,0.003 0.029,0.006 0.044,0.008 0.007,0.001 0.015,0.003 0.022,0.004 0.014,0.002 0.028,0.006 0.042,0.008 0.059,0.008 0.117,0.013 0.176,0.013 l 0.001,0 0.001,0 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.155,-0.01 0.232,-0.024 0.013,-0.002 0.026,-0.003 0.039,-0.006 0.01,-0.002 0.019,-0.006 0.029,-0.008 0.07,-0.017 0.14,-0.037 0.207,-0.065 0.007,-0.003 0.014,-0.007 0.021,-0.01 0.004,-0.002 0.008,-0.004 0.012,-0.006 0.006,-0.003 0.012,-0.003 0.018,-0.006 L 97.238,75.317 C 97.703,75.098 98,74.631 98,74.117 L 98,38.034 C 98,38.028 97.998,38.023 97.998,38.017 97.997,37.943 97.989,37.871 97.976,37.8 z m -60.762385,40.617048 -7.614,3.666 3.972,1.986 3.641,-1.986 0,6.29 -33.8715518,-16.935338 0,-9.829 8.6775518,4.241338 -7.2569997,3.35 3.972,1.986 7.2689997,-3.378 4.313,2.051 -7.487,3.456 3.972,1.986 7.503,-3.482 4.621,2.344 -7.381,3.407 3.972,1.986 7.395,-3.434 4.303,2.111 z M 65.228,76.939 39.861615,88.216048 l 0,-16.57 L 65.228,60.37 z M 3.3410632,58.52771 l 0,-3.31 33.8725518,16.603338 0,3.31 z"
+ id="path3502"
+ style="fill:#666666;fill-opacity:1" />
+ </g>
+ <polygon
+ points="33.117,56.241 39.407,53.262 45.366,56.241 39.076,59.22 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.46318,-16.30443)"
+ id="polygon3506"
+ style="fill:#666666;fill-opacity:1" />
+ <polygon
+ points="28.814,53.593 22.855,50.613 29.145,47.634 35.103,50.613 "
+ transform="matrix(0.44775907,0.89415425,-0.89415425,0.44775907,70.02568,-16.55443)"
+ id="polygon3508"
+ style="fill:#666666;fill-opacity:1" />
+ <g
+ transform="matrix(0,-0.2492475,0.19547686,0.16114179,71.005984,62.192969)"
+ id="Captions"
+ style="fill:#666666;fill-opacity:1" />
+ <g
+ transform="translate(122.10986,-55.111168)"
+ id="Captions-7"
+ style="fill:#666666;fill-opacity:1" />
+ <path
+ d="m 45.058193,34.347585 c 2.124399,2.704098 4.295157,7.985437 4.295157,12.865587 0,4.87818 -2.170758,6.542025 -4.295157,5.703941 0,-1.998055 0,-16.795084 0,-18.569528 z"
+ id="path4818-2-4-3"
+ style="fill:#666666;fill-opacity:1" />
+ <g
+ transform="translate(74.936297,109.72221)"
+ id="Your_Icon"
+ style="fill:#666666;fill-opacity:1" />
+ </g>
+</svg>
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.png
index ca4ec4b..ca4ec4b 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.svg
index 00f5b44..00f5b44 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-intro.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-intro.svg
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.png
index 850456e..850456e 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.svg b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.svg
index eb33570..eb33570 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-save.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-save.svg
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-adm.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-adm.png
index b72e4ac..b72e4ac 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-adm.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-adm.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-locale.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-locale.png
index 0dddb7a..0dddb7a 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-locale.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-locale.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-persistence.png b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-persistence.png
index d0b0a1f..d0b0a1f 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-opt-persistence.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-opt-persistence.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter.png b/wiki/src/blueprint/greeter_revamp_UI/greeter.png
index 218ffbf..218ffbf 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/menu.png b/wiki/src/blueprint/greeter_revamp_UI/menu.png
index 8e7f19f..8e7f19f 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/menu.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/menu.png
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups.mdwn b/wiki/src/blueprint/greeter_revamp_UI/mockups.mdwn
index aa717cb..aa717cb 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups.mdwn
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/README b/wiki/src/blueprint/greeter_revamp_UI/mockups/README
index 933c9d7..933c9d7 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/README
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/README
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py b/wiki/src/blueprint/greeter_revamp_UI/mockups/mockup.py
index 33741ed..33741ed 100755
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/mockup.py
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter1.ui b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter1.ui
index d9dc0d2..d9dc0d2 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter1.ui
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter1.ui
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter2.ui b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter2.ui
index 984d1e6..984d1e6 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter2.ui
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter2.ui
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter3.ui b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter3.ui
index 08715aa..08715aa 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter3.ui
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter3.ui
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter4.ui b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter4.ui
index 6674cbf..6674cbf 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter4.ui
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter4.ui
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter5.ui b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter5.ui
index bb9f22b..bb9f22b 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/tails-greeter5.ui
+++ b/wiki/src/blueprint/greeter_revamp_UI/mockups/tails-greeter5.ui
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/possible_roadmaps.mdwn b/wiki/src/blueprint/greeter_revamp_UI/possible_roadmaps.mdwn
index 45aa03e..45aa03e 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/possible_roadmaps.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/possible_roadmaps.mdwn
diff --git a/wiki/src/blueprint/hardware_for_automated_tests.mdwn b/wiki/src/blueprint/hardware_for_automated_tests.mdwn
new file mode 100644
index 0000000..1457796
--- /dev/null
+++ b/wiki/src/blueprint/hardware_for_automated_tests.mdwn
@@ -0,0 +1,83 @@
+
+Rationale
+==========
+
+We need more CPU and RAM to be able to automatically test the ISOs build by our
+jenkins. (tracked by [[!tails_ticket 5288]])
+
+See [[!tails_ticket 7631]] for the specifications of the required hardware.
+
+From there 3 options can be the basis for a decision.
+
+
+Costs
+======
+
+## Option A: upgrade lizard
+
+Aka. resell the hardware we replace to Riseup, and get new better hardware.
+No need for a new case or new HDD and heatsinks.
+
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $393,75
+ * 2 x Intel® E5-2650Lv3-1.8Ghz/12C, 30M, 9.6GT/s, 65W LGA2011 CPU - $1,427.35 x 2
+ * 1 x 128GB of RAM - $2000
+
+Total --- **$5400**
+
+
+## Option B : 2nd box dedicated to the tests
+
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $393,75
+ * 2 x E5-2630Lv3 - 1.8Ghz/8C, 20M, 8.0GT/s, 55W - $657.50 x 2
+ * 1 x 128GB of RAM - $2000
+ * 2 x WD 500GB/10K RPM, 64M, 6Gb/s, 2.5" SATA3 HD - $141,50 x 2
+ * 2 x Heatsinks - $50 x 2
+ * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $345,50
+
+Total --- **$4500**
+
+
+## Option C : 2nd box with best CPUs
+
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $393,75
+ * 2 x Intel® E5-2650Lv3-1.8Ghz/12C, 30M, 9.6GT/s, 65W LGA2011 CPU - $1,427.35 x 2
+ * 1 x 128GB of RAM - $2000
+ * 2 x WD 500GB/10K RPM, 64M, 6Gb/s, 2.5" SATA3 HD - $141,50 x 2
+ * 2 x Heatsinks - $50 x 2
+ * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $345,50
+
+Total --- **$6200**
+
+
+Pros and Cons
+==============
+
+In term of costs, options A and B are quite similar if we sell the remaining
+"old" hardware in A. But this has to be decided. Option C is more expensive.
+
+Upgrading lizard to better CPUs (option A) has the benefit of not adding much
+more sysadmin work on our plate.
+
+On the other hand we'll have 46 of 48 CPUs threads, and not much options apart
+from buying a new machine if we want more. This option tend to assume we won't
+need much more CPUs in the near future.
+
+Option B and C (new machine) in the contrary brings more sysadmin works.
+
+They also bring the question of the connectivity between the 2 machines. They
+both have 2 nics, so they could be connected through their unused one, but
+probably require to setup a VPN or something.
+
+They also raise the question of deciding where to put the different
+services/VMs.
+
+Option B will have 2 x 24 CPU threads. Lizard could handle the current and
+upcoming VMs (18 threads), the new one could get the automatic test VMs (6-12
+threads), yet the ISO builders (16 theads) won't be easy to fit somewhere.
+
+With option C, the new machine could probably get the whole build and test chain
+(ISO builders and testers) say 30 threads, with the jenkins vm, and still some room
+for more builders. Lizard would handle the current and upcoming VMs (18 threads)
+nicely.
+
+
diff --git a/wiki/src/blueprint/incremental_upgrades.mdwn b/wiki/src/blueprint/incremental_upgrades.mdwn
index 3646412..fcf5b21 100644
--- a/wiki/src/blueprint/incremental_upgrades.mdwn
+++ b/wiki/src/blueprint/incremental_upgrades.mdwn
@@ -3,58 +3,7 @@
See also:
* the [[corresponding design document|contribute/design/incremental_upgrades]];
- * the [corresponding open tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=126).
-
-# Roadmap
-
-1. (**past**) Tails 0.13 has the harmless part of the
- `feature/incremental-upgrades` branch merged (users creation with
- sudo credentials, dependencies installation), leaving aside the
- part about running the upgrade frontend automatically at startup.
- => Tails 0.13 should have been able to incrementally upgrade to
- something newer, when running the upgrade frontend by hand,
- but the included Tails OpenPGP signing key expired too quickly for
- this to happen.
-
-2. (**past**) Now that 0.14 is out:
-
- * Prepare IUK: **done**
- * Update upgrade-description files: **done**
- * Ask beta testers to try the incremental upgrade process: **done**
- * Find most critical bugs: **done**.
-
-3. (**pending review**) Complete **phase one: make ready for more alpha testing**
-
- See [[!tails_ticket 5922 desc="phase one"]].
-
-4. (**pending review**) Complete **phase two: make ready for beta testing**
-
- See [[!tails_ticket 5490 desc="phase two"]]. Once part of a release
- (candidate):
-
- * Prepare IUK
- * Update upgrade-description files
- * Ask beta testers to try the incremental upgrade process
- * Catch and fix most remaining bugs
-
-5. Complete **phase three: deploy in production**
-
- Once we're happy with the whole thing, ship it, enabled by
- default, in the next Tails major release.
-
- See child tickets of [[!tails_ticket 6014 desc="phase three"]].
-
-6. Later
-
- See tickets with *Incremental upgrades* category on
- [[!tails_redmine desc="Redmine"]].
-
-# Code
-
-* The bulk of the code needed to implement this design lives in the
- `iuk` [[contribute/Git]] repository.
-* Integration work is being done in the `feature/incremental-upgrades`
- branch of the main Tails [[contribute/Git]] repository.
+ * the tickets with the _Incremental upgrades_ category on [[!tails_redmine "" desc="Redmine"]].
# Random ideas for future improvements
@@ -93,6 +42,8 @@ network. It looks doable given it's a separate process: we may run it
as a dedicated user, and reuse the `clearnet` infrastructure
implemented for the Unsafe Browser.
+[[!tails_ticket 7878]]
+
### "Retry with new circuit" button
Circuit throughput varies wildly, and since this is a large download,
@@ -102,99 +53,6 @@ switch circuit every X minutes or Y% progress? That could even make
fingerprinting the download on the Tor client <-> Entry Node side of
the pipe a bit more difficult, for whatever that's worth.
-# Dialogs and error messages
-
-## Not enough memory available
-
-**Not enough memory available to check for upgrades.**
-
-- Make sure this system satisfies the requirements for running Tails.<br/>
- See file:///usr/share/doc/tails/website/doc/about/requirements.en.html
-- Try to restart Tails and upgrade again.
-- Or do a manual upgrade.<br/>
- See https://tails.boum.org/doc/first_steps/upgrade#manual
-
-## Error while checking for upgrades
-
-**Could not determine whether an upgrade is available from our website.**
-
-Check your network connection, and restart Tails to try upgrading again.
-
-If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html.
-
-**Debugging information**
-
-...
-
-## Upgrade available
-
-**You should upgrade to Tails 0.22.**
-
-For more information about this new version, go to https://tails.boum.org/news/version_0.22/.
-
-Note that:
-
- - It is recommended to close all the open applications during the upgrade.
- - Downloading the upgrade might take a long time, from several minutes to a few hours.
- - The networking will be disabled after downloading the upgrade.
-
-Download size: 201 MB
-
-Do you want to upgrade now?
-
-[Upgrade later] [Upgrade now]
-
-## New version available
-
-**You should do a manual upgrade to Tails 0.22.**
-
-For more information about this new version, go to https://tails.boum.org/news/version_0.22/.
-
-It is not possible to automatically upgrade your device to this new version.
-
-To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade#manual
-
-## Downloading upgrade
-
-Downloading the upgrade to Tails 0.22...
-
-## Error while downloading the upgrade
-
-**The upgrade could not be downloaded.**
-
-Check your network connection, and restart Tails to try upgrading again.
-
-If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html.
-
-**Debugging information**
-
-...
-
-## Upgrading the system
-
-**Your Tails device is being upgraded...**
-
-For security reasons, the networking is now disabled.
-
-## Error while installing the upgrade
-
-**An error occured while installing the upgrade.**
-
-Your Tails device needs to be repaired and might be unable to restart.
-
-Please follow the instructions at file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html
-
-**Debugging information**
-
-...
-
-## Restart Tails
-
-**Your Tails device was successfully upgraded.**
-
-Some security features were temporarily disabled.<br/>
-You should restart Tails on the new version as soon as possible.
-
-Do you want to restart now?
+### Surviving key compromise
-[Restart later] [Restart now]
+* https://wiki.ubuntu.com/ImageBasedUpgrades/GPG
diff --git a/wiki/src/blueprint/kernel_hardening.mdwn b/wiki/src/blueprint/kernel_hardening.mdwn
index 4e80271..01ae0be 100644
--- a/wiki/src/blueprint/kernel_hardening.mdwn
+++ b/wiki/src/blueprint/kernel_hardening.mdwn
@@ -1,5 +1,7 @@
[[!meta title="Linux kernel hardening"]]
+* Corresponding ticket: [[!tails_ticket 7649]]
+
The GNU/Linux kernel is currently a stock Debian GNU/Linux kernel. Using the paxtest tool, we can test techniques for exploitation. The default kernel without grsec is less than secure but we should never do worse than what is currently documented on this page. With each release of Tails, we should update this page.
diff --git a/wiki/src/blueprint/macchanger.mdwn b/wiki/src/blueprint/macchanger.mdwn
index eb40aaa..bfab8b1 100644
--- a/wiki/src/blueprint/macchanger.mdwn
+++ b/wiki/src/blueprint/macchanger.mdwn
@@ -57,9 +57,12 @@ spoofing). However, after investigating the sources for some OUI:s
common in certain geographical areas. This makes the lists too small
and unreliable at the moment.
-Another attempt at collecting MAC addresses for various kinds of
-hardware is [Boruch-Baum's
-mac_changer_choice](https://github.com/Boruch-Baum/mac_changer_choice).
+There are others attempts at collecting MAC addresses for various
+kinds of hardware:
+
+* [Boruch-Baum's mac_changer_choice](https://github.com/Boruch-Baum/mac_changer_choice)
+* Subgraph's [ouiner](https://bitbucket.org/mckinney_subgraph/ouiner),
+ whose data is used by [macouflage](https://bitbucket.org/mckinney_subgraph/macouflage)
# Questions, remaining issues, and other random stuff
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 7b6a118..e7337c1 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -1,10 +1,19 @@
-[[!meta title="Next monthly meeting"]]
+[[!meta title="Agenda for the next contributors meeting"]]
-Agenda
-======
+[[Official place and date are in the calendar.|contribute/calendar]]
-Todo/discuss
-------------
+Availability and plans for the next weeks
+=========================================
-* https://labs.riseup.net/code/issues/6972 Create a "Sponsors" page
-* https://labs.riseup.net/code/issues/7521 Export iCal calendar from ikiwiki?
+ - Volunteers to handle "[Hole in the roof](https://labs.riseup.net/code/versions/198)" tickets this month
+ - Availability and plans for monthly low-hanging fruits meeting
+
+Discussions
+===========
+
+ - [[!tails_ticket 5684 desc="Screen locker"]]
+ - [[!tails_ticket 7061 desc="Random hostname option needed on startup"]] and [Let's share username, /etc/hostname and /etc/host among all anonymity distributions](https://mailman.boum.org/pipermail/tails-dev/2014-August/006736.html)
+ - [[!tails_ticket 7419 desc="Rename Tor Browser in camouflage mode?"]]
+ - [[!tails_ticket 8125 desc="Host the Tor Browser tarballs we need ourselves"]]
+ - [[!tails_ticket 8174 desc="Build Tor with seccomp"]]
+ - [[!tails_ticket 8236 desc="Greeter revamp: Decide between 'play' and 'computer' logo for Start button"]]
diff --git a/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn b/wiki/src/blueprint/persistence_iceweasel_client_certificates_preset.mdwn
index e9bef15..e9bef15 100644
--- a/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn
+++ b/wiki/src/blueprint/persistence_iceweasel_client_certificates_preset.mdwn
diff --git a/wiki/src/blueprint/python3.mdwn b/wiki/src/blueprint/python3.mdwn
index 18b3eb4..3e3127f 100644
--- a/wiki/src/blueprint/python3.mdwn
+++ b/wiki/src/blueprint/python3.mdwn
@@ -44,12 +44,12 @@ None
# Tails Greeter
-* `pycountry`: **no Python 3 version in Debian**
+* `pycountry`: OK, `python3-pycountry` (unstable)
- `icu`: OK, `python3-icu`
# Tails Installer
-- `configobj`: **no Python 3 version in Debian**
+- `configobj`: OK, `python3-configobj` (unstable)
- `StringIO`: the `StringIO` module is included in the stdlib, and
available in python3 as `io.StringIO` or `io.BytesIO`
- `PyQt4`: OK, `python3-pyqt4`
@@ -65,5 +65,5 @@ None
- `gtk`: deprecated, replaced by `python3-gi` and `gir1.2-gtk-3.0`
- `gobject`: deprecated, replaced by `python3-gi`
- `webkit`: deprecated, replaced by `python3-gi` and `gir1.2-webkit-3.0`
-- `gnutls`: no python3 version, seems replaced by <https://gitorious.org/pygnutls> but we might not need it anymore
+- `gnutls`: **no python3 version**; seems replaced by <https://gitorious.org/pygnutls> but we might not need it anymore
- `urlparse`: renamed `urllib.urlparse`
diff --git a/wiki/src/blueprint/remove_adblock__63__.mdwn b/wiki/src/blueprint/remove_adblock__63__.mdwn
index aa28068..9144a8b 100644
--- a/wiki/src/blueprint/remove_adblock__63__.mdwn
+++ b/wiki/src/blueprint/remove_adblock__63__.mdwn
@@ -1,4 +1,4 @@
-It was [[pointed out in the forum|forum/Fingerprints]] that the Tor
+Tor
browser probably never will include an ad blocker, like we do. See:
[2.3.5: No filters](https://www.torproject.org/projects/torbrowser/design/#philosophy)
diff --git a/wiki/src/blueprint/replace_vagrant.mdwn b/wiki/src/blueprint/replace_vagrant.mdwn
index 12e3b68..77aaf2b 100644
--- a/wiki/src/blueprint/replace_vagrant.mdwn
+++ b/wiki/src/blueprint/replace_vagrant.mdwn
@@ -24,10 +24,7 @@ What we have
one too. No idea about Ubuntu 14.04 LTS and upcoming 14.10, let
alone other distros or non-Linux OS.
-* Our Vagrant setup does not work for building on-disk (as opposed as
- building in RAM) ([[!tails_ticket 7133]]), and our basebox is still
- based on Squeeze ([[!tails_ticket 7218]]).
- Both are being addressed.
+* Our Vagrant setup has many problems: [[!tails_ticket 7527]].
* What our Vagrant thing does:
- downloads and checks a build basebox as needed
@@ -41,9 +38,7 @@ What we have
- retrieve the build artifacts from the build VM onto the host system
* Vagrant hasn't been actively maintained in Debian for a while.
- It was removed from testing, and won't be in Jessie unless someone™
- does something™ about it. It was just orphaned. It's unclear if
- someone is going to adopt it.
+ It'll likely be part of Jessie, but that's by a very short margin.
* VirtualBox vs. QEMU/KVM:
- One can't run both VirtualBox and QEMU/KVM on the same system.
@@ -57,7 +52,7 @@ What we have
- There's a vagrant-libvirt plugin available, not in Debian yet, see
the corresponding blueprint for packaging and backporting
challenges. That's irrelevant, though, if the vagrant package
- itself is not maintained in Debian.
+ itself is not very well maintained in Debian.
- There's a libvirt driver for VirtualBox too.
* Vagrant's upstream provides a .deb, but no proper source package
@@ -69,10 +64,24 @@ What we have
* Docker is seeing a lot of traction lately. It might be a better bet
than Vagrant on the long-term.
+What others use
+===============
+
+* Ubuntu cloud images are built with vmbuilder, which works basically
+ at the same level as live-build. It might be useful to create and
+ maintain a builder basebox, but it doesn't provide the same glue as
+ Vagrant for downloading, managing, booting and file sharing.
+* Same for other building cloud images for other operating systems,
+ apparently:
+ <http://docs.openstack.org/image-guide/content/ch_creating_images_automatically.html>
+* [Vortex](https://github.com/websecurify/node-vortex/) is similar
+ to Vagrant. Only supports VirtualBox (and the Amazon cloud) as
+ of 20141130.
+
Plan
====
* Short-term: fix the Vagrant situation for the most important
- usecases ([[!tails_ticket 7526]])
+ usecases ([[!tails_ticket 7527]])
* Mid-term: fix the situation for real, starting with evaluating
- Docker ([[!tails_ticket 7527]], [[blueprint/evaluate_Docker]])
+ Docker ([[!tails_ticket 7530]], [[blueprint/evaluate_Docker]])
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.png b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.png
deleted file mode 100644
index 8aefebc..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.svg b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.svg
deleted file mode 100644
index cfa551a..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.svg
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.2"
- width="449.65796"
- height="192.8515"
- id="svg4623"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="greeter-1st-screen-langsaved.svg"
- inkscape:export-filename="/home/amnesia/Persistent/dev/tails/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-langsaved.png"
- inkscape:export-xdpi="149.94"
- inkscape:export-ydpi="149.94">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="713"
- id="namedview4199"
- showgrid="false"
- inkscape:zoom="1.6723823"
- inkscape:cx="224.82898"
- inkscape:cy="78.601489"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg4623" />
- <defs
- id="defs4625" />
- <metadata
- id="metadata4628">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.57048941px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
- id="rect2985-9-3"
- y="0.28385389"
- x="0.27968827"
- height="192.28941"
- width="449.08704" />
- <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="flowRoot3755-9-2"
- transform="matrix(0.66250987,0,0,0.66250987,155.35534,-9.4204829)"><flowRegion
- id="flowRegion3757-0-7"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
- id="rect3759-6-1"
- y="14.935519"
- x="29.29443"
- height="21.213215"
- width="676.80176" /></flowRegion><flowPara
- id="flowPara3761-0-6">Welcome to Tails</flowPara></flowRoot> <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="flowRoot3763-2-9"
- transform="matrix(0.66250987,0,0,0.66250987,-13.822354,13.929467)"><flowRegion
- id="flowRegion3765-8-3"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="rect3767-8-7"
- y="45.240093"
- x="27.274118"
- height="29.791271"
- width="626.87958" /></flowRegion><flowPara
- id="flowPara3769-4-6">Ce Tails est configuré en Français (France) avec un clavier français</flowPara></flowRoot> <rect
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- id="rect4585"
- y="44.164169"
- x="354.72964"
- height="17.142857"
- width="80.714287" />
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- id="rect4587"
- y="53.449871"
- x="374.72964"
- height="1.4285715"
- width="18.571428" />
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4589"
- y="40.972816"
- x="357.72964"
- height="19.305101"
- width="45.430614" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text4591"
- y="53.592747"
- x="358.87253"><tspan
- id="tspan4593"
- y="53.592747"
- x="358.87253">Changer</tspan></text>
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.02595329;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4595"
- y="40.592751"
- x="407.58682"
- height="19.547916"
- width="39.07143" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text4597"
- y="54.449871"
- x="408.44394"><tspan
- id="tspan4599"
- y="54.449871"
- x="408.44394">Effacer</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="text4601"
- y="39.449928"
- x="4.3010507"><tspan
- id="tspan4603"
- y="39.449928"
- x="4.3010507"
- style="font-size:10.60000038px">Langue, région et clavier</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9-8-2"
- y="40.983559"
- x="158.46994"><tspan
- style="fill:#0000ff"
- id="tspan5725-3-0-03"
- y="40.983559"
- x="158.46994">More info</tspan></text>
- <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="flowRoot3771-0"
- transform="matrix(0.66250987,0,0,0.66250987,-19.477379,-61.925288)"><flowRegion
- id="flowRegion3773-4"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
- id="rect3775-5"
- y="289.69702"
- x="35.355339"
- height="23.301508"
- width="375.50552" /></flowRegion><flowPara
- id="flowPara3806-6">Select your configuration options</flowPara></flowRoot> <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-4-3"
- y="145.68849"
- x="5.5886798"
- height="39.190517"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-8-4-3"
- y="145.68849"
- x="153.82025"
- height="39.190517"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-5-4-1"
- y="145.68849"
- x="301.68637"
- height="39.190517"
- width="143.0589" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3836-4"
- y="168.20805"
- x="21.469875"><tspan
- id="tspan3838-7"
- y="168.20805"
- x="21.469875">Guided configuration</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3840-4"
- y="168.20805"
- x="162.70108"><tspan
- id="tspan3842-3"
- y="168.20805"
- x="162.70108">Advanced configuration</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3844-1"
- y="161.58296"
- x="372.82498"><tspan
- id="tspan3846-4"
- y="161.58296"
- x="372.82498">Launch with default</tspan><tspan
- id="tspan3848-0"
- y="174.83311"
- x="372.82498">configuration</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="text4203"
- y="80.269676"
- x="5.6256976"><tspan
- id="tspan4205"
- y="80.269676"
- x="5.6256976">Unlock your persistent encrypted data and preferences</tspan><tspan
- y="80.269676"
- x="5.6256976"
- id="tspan3959" /></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.46000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-4-3-6"
- y="91.365257"
- x="64.266228"
- height="22.202259"
- width="292.88318" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3836-4-4"
- y="108.04073"
- x="72.197319"><tspan
- id="tspan3838-7-4"
- y="108.04073"
- x="72.197319">**********</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9"
- y="81.114754"
- x="342.70444"><tspan
- style="fill:#0000ff"
- id="tspan5725-3"
- y="81.114754"
- x="342.70444">More info</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9-1"
- y="140.65077"
- x="208.96841"><tspan
- style="fill:#0000ff"
- id="tspan5725-3-5"
- y="140.65077"
- x="208.96841">More info</tspan></text>
- <g
- id="layer1-7"
- transform="matrix(0.3885439,0,0,0.3885439,329.16425,89.417462)">
- <path
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="rect3600"
- d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z" />
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3610"
- transform="translate(0.36363745,-0.3636359)">
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3598">
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604"
- y="18"
- x="10.181818"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-4"
- y="18"
- x="21.818184"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-8"
- y="18"
- x="33.454552"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-5"
- y="18"
- x="45.090912"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- </g>
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3604"
- transform="translate(0,-0.13636303)">
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-0"
- y="28.363634"
- x="10.181817"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-4-3"
- y="28.363634"
- x="21.818184"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-8-6"
- y="28.363634"
- x="33.454552"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-5-1"
- y="28.363634"
- x="45.090912"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- </g>
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3677"
- y="38.719563"
- x="10.26502"
- ry="2.0048456"
- rx="1.9672368"
- height="6.3790541"
- width="42.742687" />
- </g>
- </g>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="text4540-9-2"
- y="105.92449"
- x="389.97324"><tspan
- id="tspan4542-5-7"
- y="105.92449"
- x="389.97324">Read-only</tspan></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.44999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3189"
- width="18.866867"
- height="18.866869"
- x="364.87589"
- y="93.015465" />
- <g
- id="g3132-9"
- transform="translate(-386.63675,-89.258407)">
- <rect
- width="50.714287"
- height="15.714286"
- x="392.76605"
- y="183.04884"
- id="rect4544-1-0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="416.33746"
- y="185.19173"
- id="rect4546-6-7"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="419.90887"
- y="194.90596"
- id="text4548-3-0"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="419.90887"
- y="194.90596"
- id="tspan4550-7-0">On</tspan></text>
- </g>
-</svg>
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.png b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.png
deleted file mode 100644
index 080fb14..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.svg b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.svg
deleted file mode 100644
index b1a9a24..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.svg
+++ /dev/null
@@ -1,560 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.2"
- width="449.87506"
- height="346.34964"
- id="svg4217"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="greeter-1st-screen-persistence.svg"
- inkscape:export-filename="/home/amnesia/Persistent/dev/tails/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-1st-screen-persistence.png"
- inkscape:export-xdpi="149.93617"
- inkscape:export-ydpi="149.93617">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="713"
- id="namedview109"
- showgrid="false"
- inkscape:zoom="1.3627847"
- inkscape:cx="229.06898"
- inkscape:cy="145.2785"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg4217"
- showguides="true"
- inkscape:guide-bbox="true" />
- <defs
- id="defs4219" />
- <metadata
- id="metadata4222">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.76480889px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
- id="rect2985-9"
- y="0.38288659"
- x="0.39403194"
- height="345.59387"
- width="449.08704" />
- <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="flowRoot3755-9"
- transform="matrix(0.66250987,0,0,0.66250987,155.46976,-9.32147)"><flowRegion
- id="flowRegion3757-0"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
- id="rect3759-6"
- y="14.935519"
- x="29.29443"
- height="21.213215"
- width="676.80176" /></flowRegion><flowPara
- id="flowPara3761-0">Welcome to Tails</flowPara></flowRoot> <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="flowRoot3763-2"
- transform="matrix(0.66250987,0,0,0.66250987,-13.70796,-11.97151)"><flowRegion
- id="flowRegion3765-8"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
- id="rect3767-8"
- y="45.240093"
- x="27.274118"
- height="35.182026"
- width="410.1712" /></flowRegion><flowPara
- id="flowPara3769-4">Select your language and keyboard layout</flowPara></flowRoot> <flowRoot
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="flowRoot3771-0"
- transform="matrix(0.66250987,0,0,0.66250987,-19.00804,83.62945)"><flowRegion
- id="flowRegion3773-4"><rect
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
- id="rect3775-5"
- y="289.69702"
- x="35.355339"
- height="23.301508"
- width="375.50552" /></flowRegion><flowPara
- id="flowPara3806-6">Select your configuration options</flowPara></flowRoot> <rect
- style="fill:none;stroke:#000000;stroke-width:0.81864589;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-0"
- y="32.308392"
- x="6.1250958"
- height="143.88576"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.81864589;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-8-1"
- y="32.308392"
- x="153.48152"
- height="143.88576"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.81864589;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-5-2"
- y="32.308392"
- x="300.83789"
- height="143.88576"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-4-3"
- y="291.24323"
- x="6.0580182"
- height="39.190517"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-8-4-3"
- y="291.24323"
- x="154.2896"
- height="39.190517"
- width="143.0589" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42724571;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-5-4-1"
- y="291.24323"
- x="302.15573"
- height="39.190517"
- width="143.0589" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3836-4"
- y="313.76282"
- x="21.939228"><tspan
- id="tspan3838-7"
- y="313.76282"
- x="21.939228">Guided configuration</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3840-4"
- y="313.76282"
- x="163.17043"><tspan
- id="tspan3842-3"
- y="313.76282"
- x="163.17043">Advanced configuration</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3844-1"
- y="307.1377"
- x="373.29437"><tspan
- id="tspan3846-4"
- y="307.1377"
- x="373.29437">Launch with default</tspan><tspan
- id="tspan3848-0"
- y="320.38788"
- x="373.29437">configuration</tspan></text>
- <flowRoot
- style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="flowRoot3862-5"
- transform="matrix(0.66250987,0,0,0.66250987,-22.79382,-11.59293)"><flowRegion
- id="flowRegion3864-8"><rect
- id="rect3866-4"
- y="70.933609"
- x="45.714287"
- height="201.42857"
- width="201.42857" /></flowRegion><flowPara
- id="flowPara3868-6">Dansk</flowPara><flowPara
- id="flowPara3890-3">Divehi</flowPara><flowPara
- id="flowPara3870-3">Dzongkha</flowPara><flowPara
- id="flowPara3872-7">Eesti</flowPara><flowPara
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- id="flowPara3874-3">English</flowPara><flowPara
- id="flowPara3878-1">Espanol</flowPara><flowPara
- id="flowPara3882-0">Euskara</flowPara><flowPara
- id="flowPara3884-7">Filipiono</flowPara><flowPara
- id="flowPara3886-9">Foroyskt</flowPara><flowPara
- id="flowPara3888-8">Français</flowPara></flowRoot> <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="text3892-2"
- y="41.269268"
- x="157.03029"><tspan
- id="tspan3894-9"
- y="41.269268"
- x="157.03029">India</tspan><tspan
- id="tspan3914-2"
- y="54.519451"
- x="157.03029">Ireland</tspan><tspan
- id="tspan3896-9"
- y="67.769669"
- x="157.03029">New Zealand</tspan><tspan
- id="tspan3898-8"
- y="81.019852"
- x="157.03029">Nigeria</tspan><tspan
- id="tspan3900-2"
- y="94.270065"
- x="157.03029">Pilippines</tspan><tspan
- id="tspan3902-0"
- y="107.52025"
- x="157.03029">Singapore</tspan><tspan
- id="tspan3904-0"
- y="120.77046"
- x="157.03029">South Arfica</tspan><tspan
- id="tspan3906-7"
- y="134.02065"
- x="157.03029">United Kingdom</tspan><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- id="tspan3908-5"
- y="147.27086"
- x="157.03029">United States</tspan><tspan
- id="tspan3910-3"
- y="160.52107"
- x="157.03029">Zambia</tspan><tspan
- id="tspan3912-1"
- y="173.77126"
- x="157.03029">Zimbabwe</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="text3916-2"
- y="40.322826"
- x="302.78247"><tspan
- id="tspan3918-9"
- y="40.322826"
- x="302.78247">English (UK, Dvorjak)</tspan><tspan
- id="tspan3920-7"
- y="53.573009"
- x="302.78247">English (UK, extended Win</tspan><tspan
- id="tspan3922-3"
- y="66.823227"
- x="302.78247">English (UK, international)</tspan><tspan
- id="tspan3924-4"
- y="80.07341"
- x="302.78247">English (UK, Macintosh in</tspan><tspan
- id="tspan3926-7"
- y="93.323624"
- x="302.78247">English (UK, Macintosh)</tspan><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- id="tspan3928-9"
- y="106.57381"
- x="302.78247">English (US)</tspan><tspan
- id="tspan3930-4"
- y="119.82402"
- x="302.78247">English (US, Cherokee)</tspan><tspan
- id="tspan3940-2"
- y="133.0742"
- x="302.78247">English (US, classic Dvora</tspan><tspan
- id="tspan3934-7"
- y="146.32442"
- x="302.78247">English (US, Colemak)</tspan><tspan
- id="tspan3936-7"
- y="159.5746"
- x="302.78247">English (Dvorak alternativ</tspan><tspan
- id="tspan3938-7"
- y="172.82478"
- x="302.78247">English (Dvorak internatio</tspan></text>
- <rect
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.66250986;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3944-6"
- y="34.454845"
- x="141.88722"
- height="140.07352"
- width="5.6786556" />
- <rect
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.66250986;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3944-0-3"
- y="33.886974"
- x="435.85229"
- height="140.07352"
- width="5.6786556" />
- <rect
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.66250986;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3944-2-9"
- y="34.076275"
- x="289.15372"
- height="140.07352"
- width="5.6786556" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- xml:space="preserve"
- id="text4203"
- y="225.82442"
- x="6.0950513"><tspan
- id="tspan4205"
- y="225.82442"
- x="6.0950513">Unlock your persistent encrypted data and preferences</tspan><tspan
- y="225.82442"
- x="6.0950513"
- id="tspan3959" /></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.46000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-4-3-6"
- y="236.92"
- x="64.735565"
- height="22.202259"
- width="292.88318" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3836-4-4"
- y="253.59547"
- x="72.666672"><tspan
- id="tspan3838-7-4"
- y="253.59547"
- x="72.666672">**********</tspan></text>
- <g
- id="g3132"
- transform="translate(-386.37714,-2.2013749)">
- <rect
- width="50.714287"
- height="15.714286"
- x="392.76605"
- y="183.04884"
- id="rect4544-1"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="416.33746"
- y="185.19173"
- id="rect4546-6"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="419.90887"
- y="194.90596"
- id="text4548-3"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="419.90887"
- y="194.90596"
- id="tspan4550-7">On</tspan></text>
- </g>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9"
- y="226.66949"
- x="343.17383"><tspan
- style="fill:#0000ff"
- id="tspan5725-3"
- y="226.66949"
- x="343.17383">More info</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9-1"
- y="286.20551"
- x="209.43776"><tspan
- style="fill:#0000ff"
- id="tspan5725-3-5"
- y="286.20551"
- x="209.43776">More info</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9-8"
- y="29.417835"
- x="262.99615"><tspan
- style="fill:#0000ff"
- id="tspan5725-3-0"
- y="29.417835"
- x="262.99615">More info</tspan></text>
- <g
- id="layer1-7"
- transform="matrix(0.3885439,0,0,0.3885439,329.63359,234.9722)">
- <path
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="rect3600"
- d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z" />
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3610"
- transform="translate(0.36363745,-0.3636359)">
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3598">
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604"
- y="18"
- x="10.181818"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-4"
- y="18"
- x="21.818184"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-8"
- y="18"
- x="33.454552"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-5"
- y="18"
- x="45.090912"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- </g>
- <g
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
- id="g3604"
- transform="translate(0,-0.13636303)">
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-0"
- y="28.363634"
- x="10.181817"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-4-3"
- y="28.363634"
- x="21.818184"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-8-6"
- y="28.363634"
- x="33.454552"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3604-5-1"
- y="28.363634"
- x="45.090912"
- ry="2"
- rx="2"
- height="6.909091"
- width="8" />
- </g>
- <rect
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3677"
- y="38.719563"
- x="10.26502"
- ry="2.0048456"
- rx="1.9672368"
- height="6.3790541"
- width="42.742687" />
- </g>
- </g>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="text4540-9-2"
- y="251.47922"
- x="390.44263"><tspan
- id="tspan4542-5-7"
- y="251.47922"
- x="390.44263">Read-only</tspan></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.44999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3189"
- width="18.866867"
- height="18.866869"
- x="365.34525"
- y="238.57021" />
- <g
- id="g3132-9"
- transform="translate(-386.16741,56.296328)">
- <rect
- width="50.714287"
- height="15.714286"
- x="392.76605"
- y="183.04884"
- id="rect4544-1-0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="416.33746"
- y="185.19173"
- id="rect4546-6-7"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="419.90887"
- y="194.90596"
- id="text4548-3-0"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="419.90887"
- y="194.90596"
- id="tspan4550-7-0">On</tspan></text>
- </g>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- id="text4540"
- y="191.43637"
- x="62.981697"><tspan
- id="tspan4542"
- y="191.43637"
- x="62.981697">Remember your localisation options unencrypted</tspan></text>
- <text
- sodipodi:linespacing="125%"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text5723-9-5-5"
- y="190.99075"
- x="318.7442"><tspan
- style="fill:#0000ff"
- id="tspan5725-3-8-7"
- y="190.99075"
- x="318.7442">More info</tspan></text>
-</svg>
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.png b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.png
deleted file mode 100644
index 67183cf..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.svg b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.svg
deleted file mode 100644
index 6c15316..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.svg
+++ /dev/null
@@ -1,733 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.2"
- width="451.06326"
- height="326.41156"
- id="svg2"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="greeter-advanced-screen.svg"
- inkscape:export-filename="/home/amnesia/Persistent/dev/tails/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-advanced-screen.png"
- inkscape:export-xdpi="149.94"
- inkscape:export-ydpi="149.94">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="713"
- id="namedview6327"
- showgrid="false"
- inkscape:zoom="1.1431022"
- inkscape:cx="363.04301"
- inkscape:cy="147.19768"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="layer1"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <defs
- id="defs4" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(-28.749258,-44.119709)"
- id="layer1">
- <flowRoot
- id="flowRoot4207"
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion4209"><rect
- width="738.57141"
- height="75.714287"
- x="-10"
- y="869.50507"
- id="rect4211" /></flowRegion><flowPara
- id="flowPara4213" /></flowRoot> <flowRoot
- id="flowRoot5205"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion5207"><rect
- width="226.42857"
- height="80"
- x="14.285714"
- y="71.647896"
- id="rect5209" /></flowRegion><flowPara
- id="flowPara5211" /></flowRoot> <flowRoot
- id="flowRoot5221"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion5223"><rect
- width="465"
- height="152.85715"
- x="16.428572"
- y="70.219322"
- id="rect5225" /></flowRegion><flowPara
- id="flowPara5227" /></flowRoot> <flowRoot
- id="flowRoot5795"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion5797"><rect
- width="243.57143"
- height="45.714287"
- x="9.2857141"
- y="195.93361"
- id="rect5799" /></flowRegion><flowPara
- id="flowPara5801" /></flowRoot> <flowRoot
- id="flowRoot5803"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion5805"><rect
- width="0"
- height="13.571428"
- x="135"
- y="184.50504"
- id="rect5807" /></flowRegion><flowPara
- id="flowPara5809" /></flowRoot> <rect
- width="450.32156"
- height="325.67548"
- x="29.123384"
- y="44.485565"
- id="rect2985"
- style="fill:none;stroke:#000000;stroke-width:0.74346161px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
- <flowRoot
- transform="matrix(0.66433109,0,0,0.66433109,182.62541,40.754513)"
- id="flowRoot3755"
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion3757"><rect
- width="676.80176"
- height="21.213215"
- x="29.29443"
- y="14.935519"
- id="rect3759"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
- id="flowPara6329">Advanced configuration</flowPara></flowRoot> <text
- x="90.611877"
- y="93.243347"
- id="text4203-4"
- xml:space="preserve"
- style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- sodipodi:linespacing="125%"><tspan
- x="90.611877"
- y="93.243347"
- id="tspan4205-0">Administration password</tspan></text>
- <flowRoot
- transform="matrix(0.66433109,0,0,0.66433109,65.569749,18.352762)"
- id="flowRoot3771-2"
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion3773-9"><rect
- width="551.54199"
- height="25.448942"
- x="35.355339"
- y="289.69702"
- id="rect3775-9"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
- id="flowPara3806-1">Circumvent a censored, filtered or proxied connection</flowPara></flowRoot> <text
- x="92.557968"
- y="162.3475"
- id="text4540-3"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="92.557968"
- y="162.3475"
- id="tspan4542-0">Looks like windows 8</tspan></text>
- <g
- transform="translate(-445.91507,89.714286)"
- id="g3106">
- <rect
- width="50.714287"
- height="15.714286"
- x="480.41507"
- y="134.34749"
- id="rect4544-2"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="483.98654"
- y="136.49036"
- id="rect4546-2"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="487.55795"
- y="146.20465"
- id="text4548-9"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="487.55795"
- y="146.20465"
- id="tspan4550-6">Off</tspan></text>
- </g>
- <flowRoot
- transform="matrix(0.66433109,0,0,0.66433109,65.842007,-54.804788)"
- id="flowRoot3771-2-0"
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion3773-9-5"><rect
- width="332.20215"
- height="21.148161"
- x="35.355339"
- y="289.69702"
- id="rect3775-9-6"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
- id="flowPara3806-1-1">Windows camouflage</flowPara></flowRoot> <text
- x="92.557968"
- y="198.91893"
- id="text4540-0"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="92.557968"
- y="198.91893"
- id="tspan4542-2">Conceal the hardware identifiert of your network card</tspan></text>
- <g
- transform="translate(-0.34367031,14)"
- id="g3175">
- <rect
- width="50.714287"
- height="15.714286"
- x="34.84367"
- y="169.63319"
- id="rect4544-4"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="58.415112"
- y="171.77606"
- id="rect4546-64"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="61.986523"
- y="181.49034"
- id="text4548-97"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="61.986523"
- y="181.49034"
- id="tspan4550-4">On</tspan></text>
- </g>
- <flowRoot
- transform="matrix(0.66433109,0,0,0.66433109,65.842009,-18.23336)"
- id="flowRoot3771-2-7"
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"><flowRegion
- id="flowRegion3773-9-0"><rect
- width="332.20215"
- height="21.148161"
- x="35.355339"
- y="289.69702"
- id="rect3775-9-5"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
- id="flowPara3806-1-18">MAC address spoofing</flowPara></flowRoot> <text
- x="308"
- y="102.93362"
- id="text5723"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="308"
- y="102.93362"
- id="tspan5725"
- style="fill:#0000ff">More info</tspan></text>
- <text
- x="198.69684"
- y="162.94736"
- id="text5723-9"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="198.69684"
- y="162.94736"
- id="tspan5725-3"
- style="fill:#0000ff">More info</tspan></text>
- <text
- x="364.55402"
- y="199.23306"
- id="text5723-0"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="364.55402"
- y="199.23306"
- id="tspan5725-1"
- style="fill:#0000ff">More info</tspan></text>
- <text
- x="285.98254"
- y="247.37592"
- id="text5723-0-6"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="285.98254"
- y="247.37592"
- id="tspan5725-1-1"
- style="fill:#0000ff">More info</tspan></text>
- <text
- x="93.027206"
- y="234.69241"
- id="text4540-0-9"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="93.027206"
- y="234.69241"
- id="tspan5909">If this computer's network connection is not free or obstacle, select this</tspan><tspan
- x="93.027206"
- y="247.19241"
- id="tspan3213">option to access Tor through a bridge.</tspan></text>
- <rect
- width="31.514418"
- height="29.346983"
- x="34.914532"
- y="49.333023"
- id="rect3779-8-4"
- style="fill:none;stroke:#000000;stroke-width:0.17352666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <text
- x="45.25119"
- y="66.969139"
- id="text3840"
- xml:space="preserve"
- style="font-size:10.62929726px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="45.25119"
- y="66.969139"
- id="tspan3842">&lt;</tspan></text>
- <g
- id="g6357"
- transform="translate(-1.7496249,-18.371061)">
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.42842022;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3779-5-4"
- y="342.09116"
- x="333.50449"
- height="39.298252"
- width="143.45216" />
- <text
- sodipodi:linespacing="125%"
- style="font-size:10.62929726px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"
- id="text3844"
- y="364.67267"
- x="405.16568"><tspan
- id="tspan3848"
- y="364.67267"
- x="405.16568">Launch</tspan></text>
- </g>
- <text
- x="90.967628"
- y="266.15967"
- id="text4203-4-3"
- xml:space="preserve"
- style="font-size:10.60015774px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
- sodipodi:linespacing="125%"><tspan
- x="90.967628"
- y="266.15967"
- id="tspan4205-0-2">Persistent encrypted data and configuration</tspan></text>
- <text
- x="362.07001"
- y="265.13568"
- id="text5723-6"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="362.07001"
- y="265.13568"
- id="tspan5725-7"
- style="fill:#0000ff">More info</tspan></text>
- <text
- x="91.296036"
- y="103.98306"
- id="text4540-0-9-7"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="91.296036"
- y="103.98306"
- id="tspan6050">Enter a password if you need admin rights.</tspan></text>
- <text
- x="93.581757"
- y="281.41162"
- id="text4540-0-9-8"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="93.581757"
- y="281.41162"
- id="tspan5909-2">Persistent volume lets you save data and configuration files</tspan></text>
- <g
- transform="translate(-445.91507,-40.556734)"
- id="g3106-1">
- <rect
- width="50.714287"
- height="15.714286"
- x="480.41507"
- y="134.34749"
- id="rect4544-2-4"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="483.98654"
- y="136.49036"
- id="rect4546-2-4"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="487.55795"
- y="146.20465"
- id="text4548-9-4"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="487.55795"
- y="146.20465"
- id="tspan4550-6-8">Off</tspan></text>
- </g>
- <g
- transform="translate(-445.91507,12.014694)"
- id="g3106-0">
- <rect
- width="50.714287"
- height="15.714286"
- x="480.41507"
- y="134.34749"
- id="rect4544-2-5"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="483.98654"
- y="136.49036"
- id="rect4546-2-0"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="487.55795"
- y="146.20465"
- id="text4548-9-49"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="487.55795"
- y="146.20465"
- id="tspan4550-6-87">Off</tspan></text>
- </g>
- <g
- transform="translate(-445.91507,127.72898)"
- id="g3106-03">
- <rect
- width="50.714287"
- height="15.714286"
- x="480.41507"
- y="134.34749"
- id="rect4544-2-49"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="25"
- height="10.714286"
- x="483.98654"
- y="136.49036"
- id="rect4546-2-5"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- <text
- x="487.55795"
- y="146.20465"
- id="text4548-9-8"
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- sodipodi:linespacing="125%"><tspan
- x="487.55795"
- y="146.20465"
- id="tspan4550-6-1">Off</tspan></text>
- </g>
- <rect
- width="143.0589"
- height="22.202259"
- x="91.790047"
- y="111.01427"
- id="rect3779-4-3-6-2"
- style="fill:none;stroke:#000000;stroke-width:0.32157761;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <text
- x="99.72113"
- y="127.68974"
- id="text3836-4-4-8"
- xml:space="preserve"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="99.72113"
- y="127.68974"
- id="tspan3838-7-4-3">**********</tspan></text>
- <rect
- width="143.0589"
- height="22.202259"
- x="239.15106"
- y="110.93641"
- id="rect3779-4-3-6-2-0"
- style="fill:none;stroke:#000000;stroke-width:0.32157761;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <text
- x="247.08215"
- y="127.61186"
- id="text3836-4-4-8-2"
- xml:space="preserve"
- style="font-size:10.60015774px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="247.08215"
- y="127.61186"
- id="tspan3838-7-4-3-9">**********</tspan></text>
- <g
- transform="matrix(0.3885439,0,0,0.3885439,206.10424,109.92203)"
- id="layer1-7-3">
- <path
- d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z"
- id="rect3600-8"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <g
- transform="translate(0.36363745,-0.3636359)"
- id="g3610-2"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <g
- id="g3598-1"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="10.181818"
- y="18"
- id="rect3604-86"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="21.818184"
- y="18"
- id="rect3604-4-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="33.454552"
- y="18"
- id="rect3604-8-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="45.090912"
- y="18"
- id="rect3604-5-7"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="translate(0,-0.13636303)"
- id="g3604-8"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="10.181817"
- y="28.363634"
- id="rect3604-0-6"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="21.818184"
- y="28.363634"
- id="rect3604-4-3-4"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="33.454552"
- y="28.363634"
- id="rect3604-8-6-1"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="45.090912"
- y="28.363634"
- id="rect3604-5-1-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <rect
- width="42.742687"
- height="6.3790541"
- rx="1.9672368"
- ry="2.0048456"
- x="10.26502"
- y="38.719563"
- id="rect3677-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- transform="matrix(0.3885439,0,0,0.3885439,353.96139,109.06489)"
- id="layer1-7-3-6">
- <path
- d="m 5.3087735,11.447899 53.3824565,0 c 2.340379,0 4.224511,2.332882 4.224511,5.230677 l 0,27.006484 c 0,2.897795 -5.884132,7.230677 -8.224511,7.230677 l -45.3824565,0 c -2.3403789,0 -8.2245107,-4.332882 -8.2245107,-7.230677 l 0,-27.006484 c 0,-2.897795 1.8841318,-5.230677 4.2245107,-5.230677 z"
- id="rect3600-8-5"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <g
- transform="translate(0.36363745,-0.3636359)"
- id="g3610-2-5"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <g
- id="g3598-1-2"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="10.181818"
- y="18"
- id="rect3604-86-4"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="21.818184"
- y="18"
- id="rect3604-4-5-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="33.454552"
- y="18"
- id="rect3604-8-5-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="45.090912"
- y="18"
- id="rect3604-5-7-5"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="translate(0,-0.13636303)"
- id="g3604-8-8"
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="10.181817"
- y="28.363634"
- id="rect3604-0-6-7"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="21.818184"
- y="28.363634"
- id="rect3604-4-3-4-9"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="33.454552"
- y="28.363634"
- id="rect3604-8-6-1-8"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- width="8"
- height="6.909091"
- rx="2"
- ry="2"
- x="45.090912"
- y="28.363634"
- id="rect3604-5-1-5-2"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.19499993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <rect
- width="42.742687"
- height="6.3790541"
- rx="1.9672368"
- ry="2.0048456"
- x="10.26502"
- y="38.719563"
- id="rect3677-5-2"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.17958236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <rect
- width="186.45065"
- height="22.656561"
- x="90.027367"
- y="286.72391"
- id="rect3779-5-4-6"
- style="fill:none;stroke:#000000;stroke-width:0.37085894;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <text
- x="183.67844"
- y="301.29529"
- id="text3844-0"
- xml:space="preserve"
- style="font-size:10.62929726px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- sodipodi:linespacing="125%"><tspan
- x="183.67844"
- y="301.29529"
- id="tspan3848-9">Configure encrypted persistence</tspan></text>
- </g>
-</svg>
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.png b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.png
deleted file mode 100644
index 27f603a..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.svg b/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.svg
deleted file mode 100644
index 201d9b3..0000000
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.svg
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.2"
- width="584.84375"
- height="362"
- id="svg10689"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="greeter-guided-context.svg"
- inkscape:export-filename="/home/amnesia/Persistent/dev/tails/wiki/src/blueprint/tails-greeter:_revamp_UI/greeter-guided-context.png"
- inkscape:export-xdpi="115.42"
- inkscape:export-ydpi="115.42">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview12131"
- showgrid="false"
- inkscape:zoom="0.64290676"
- inkscape:cx="292.42188"
- inkscape:cy="181"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg10689" />
- <defs
- id="defs10691" />
- <metadata
- id="metadata10694">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(-396.59375,-217.0625)"
- id="layer1">
- <rect
- width="582.85712"
- height="360"
- x="397.59409"
- y="218.07648"
- id="rect3680-1"
- style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
- <g
- transform="matrix(2,0,0,2,368.83223,-668.0772)"
- id="g4483-3-5">
- <rect
- width="17.910515"
- height="16.637951"
- x="18.997116"
- y="449.04355"
- id="rect3779-8-4-8-9-0-3"
- style="fill:none;stroke:#000000;stroke-width:0.70866144;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <text
- x="24.880856"
- y="468.42154"
- transform="scale(1.0204486,0.97996117)"
- id="text3840-5-9-2-62"
- xml:space="preserve"
- style="font-size:7.31488562px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"><tspan
- x="24.880856"
- y="468.42154"
- id="tspan3842-34-0-8-7">&lt;</tspan></text>
- </g>
- <text
- x="695.36548"
- y="295.81128"
- id="text4515-8"
- xml:space="preserve"
- style="font-size:22px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
- x="695.36548"
- y="295.81128"
- id="tspan4517-1">CONTEXT</tspan></text>
- <rect
- width="204.95174"
- height="44.143444"
- x="527.34338"
- y="318.10254"
- id="rect6998"
- style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <flowRoot
- transform="matrix(2,0,0,2,1067.452,-752.4039)"
- id="flowRoot7816"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7818"><rect
- width="86.71035"
- height="26.80138"
- x="-260.13104"
- y="539.19458"
- id="rect7820" /></flowRegion><flowPara
- id="flowPara7822"
- style="font-size:10px">Home and office</flowPara></flowRoot> <rect
- width="204.95174"
- height="44.143444"
- x="527.34338"
- y="376.43494"
- id="rect6998-9"
- style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <flowRoot
- transform="matrix(2,0,0,2,1089.913,-694.0715)"
- id="flowRoot7816-3"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7818-0"><rect
- width="86.71035"
- height="26.80138"
- x="-260.13104"
- y="539.19458"
- id="rect7820-5" /></flowRegion><flowPara
- id="flowPara7822-7"
- style="font-size:10px">Public place</flowPara></flowRoot> <rect
- width="204.95174"
- height="44.143444"
- x="527.34338"
- y="433.1908"
- id="rect6998-95"
- style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <flowRoot
- transform="matrix(2,0,0,2,1103.9804,-637.31564)"
- id="flowRoot7816-9"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7818-9"><rect
- width="86.71035"
- height="26.80138"
- x="-260.13104"
- y="539.19458"
- id="rect7820-4" /></flowRegion><flowPara
- id="flowPara7822-9"
- style="font-size:10px">Web cafe</flowPara></flowRoot> <rect
- width="204.95174"
- height="44.143444"
- x="527.34338"
- y="493.09973"
- id="rect6998-3"
- style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <flowRoot
- transform="matrix(2,0,0,2,1117.2274,-577.40666)"
- id="flowRoot7816-6"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7818-4"><rect
- width="86.71035"
- height="26.80138"
- x="-260.13104"
- y="539.19458"
- id="rect7820-6" /></flowRegion><flowPara
- id="flowPara7822-8"
- style="font-size:10px">Offline</flowPara></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,966.93443,-617.57624)"
- id="flowRoot7908"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7910"><rect
- width="112.54063"
- height="23.849157"
- x="-108.69207"
- y="496.63913"
- id="rect7912"
- style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
- id="flowPara7922"
- style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Public place</flowPara><flowPara
- id="flowPara7924"
- style="font-size:4px;text-align:justify;text-anchor:start">You are connecting to the Internet for the first time in this location or you need to hide your MAC Address</flowPara><flowPara
- id="flowPara7926"
- style="font-size:4px;text-align:justify;text-anchor:start">Affected options: MAC Spoofing ON, Camouflage ON</flowPara><flowPara
- id="flowPara7928"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7946"
- style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,968.97557,-494.49652)"
- id="flowRoot7908-8"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7910-3"><rect
- width="109.75365"
- height="23.849157"
- x="-108.69207"
- y="496.63913"
- id="rect7912-6"
- style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
- id="flowPara7938-7"
- style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Offline</flowPara><flowPara
- id="flowPara7940-1"
- style="font-size:4px;text-align:justify;text-anchor:start">You don't want to connect to the Internet.</flowPara><flowPara
- id="flowPara7946-79"
- style="font-size:4px;text-align:justify;text-anchor:start">Affected options: Network: OFF, Camouflage: OFF</flowPara></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,967.69971,-575.8386)"
- id="flowRoot7908-4"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7910-9"><rect
- width="110.86845"
- height="40.013618"
- x="-108.69207"
- y="496.63913"
- id="rect7912-4"
- style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
- id="flowPara7928-1"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7930-00"
- style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Web cafe</flowPara><flowPara
- id="flowPara7932-8"
- style="font-size:4px;text-align:justify;text-anchor:start">You are in an Internet cafe and don't want the network administrator to notice an unknown MAC Address connection</flowPara><flowPara
- id="flowPara7934-8"
- style="font-size:4px;text-align:justify;text-anchor:start">Affected options: MAC Spoofing: OFF, Camouflage: ON</flowPara><flowPara
- id="flowPara7936-22"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7942-4"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7944-2"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7946-2"
- style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,968.54661,-676.95998)"
- id="flowRoot7908-6"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;text-align:justify;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion7910-0"><rect
- width="110.86845"
- height="32.210087"
- x="-108.69207"
- y="496.63913"
- id="rect7912-5"
- style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
- id="flowPara7914-92"
- style="font-size:4px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Sans Bold">Home &amp; office</flowPara><flowPara
- id="flowPara7916-2"
- style="font-size:4px;text-align:justify;text-anchor:start">You have previously connected to the Internet from thos location and don't need to hide your MAC address</flowPara><flowPara
- id="flowPara7918-9"
- style="font-size:4px;text-align:justify;text-anchor:start">Affected options : MAC Spoofing OFF, Camouflage OFF</flowPara><flowPara
- id="flowPara7920-63"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7944-5"
- style="font-size:4px;text-align:justify;text-anchor:start" /><flowPara
- id="flowPara7946-22"
- style="font-size:4px;text-align:justify;text-anchor:start" /></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,996.34139,-705.57632)"
- id="flowRoot8410"
- xml:space="preserve"
- style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion8412"><rect
- width="56.755863"
- height="15.765518"
- x="-297.18002"
- y="496.62769"
- id="rect8414"
- style="font-size:6px" /></flowRegion><flowPara
- id="flowPara8416">Introduction</flowPara></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,996.92147,-678.37416)"
- id="flowRoot8410-0"
- xml:space="preserve"
- style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion8412-9"><rect
- width="56.755863"
- height="15.765518"
- x="-297.18002"
- y="496.62769"
- id="rect8414-7"
- style="font-size:6px" /></flowRegion><flowPara
- id="flowPara8471"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">Context</flowPara></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,996.84531,-621.3314)"
- id="flowRoot8410-3"
- xml:space="preserve"
- style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion8412-3"><rect
- width="56.755863"
- height="15.765518"
- x="-297.18002"
- y="496.62769"
- id="rect8414-4"
- style="font-size:6px" /></flowRegion><flowPara
- id="flowPara8416-8">Check and go</flowPara></flowRoot> <flowRoot
- transform="matrix(2,0,0,2,996.34139,-648.53692)"
- id="flowRoot8410-37"
- xml:space="preserve"
- style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion8412-0"><rect
- width="63.850346"
- height="15.765518"
- x="-297.18002"
- y="496.62769"
- id="rect8414-45"
- style="font-size:6px" /></flowRegion><flowPara
- id="flowPara8416-5">Need to save data?</flowPara></flowRoot> <path
- d="m 976.86271,269.22938 c -583.32416,0 -580.17106,0 -580.17106,0"
- id="path8475"
- style="fill:none;stroke:#000000;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- d="m 522.81579,269.22938 -3.1531,305.85106"
- id="path8477"
- style="fill:none;stroke:#000000;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <flowRoot
- transform="matrix(2,0,0,2,1086.9344,-685.57632)"
- id="flowRoot9330"
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
- id="flowRegion9332"><rect
- width="79.150124"
- height="22.853205"
- x="-166.66118"
- y="615.92169"
- id="rect9334" /></flowRegion><flowPara
- id="flowPara9336"
- style="font-size:4px;fill:#0000ff;fill-opacity:1">More info</flowPara></flowRoot> <text
- x="588.02039"
- y="247.73596"
- id="text4515-8-1-1-5"
- xml:space="preserve"
- style="font-size:22px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
- x="588.02039"
- y="247.73596"
- id="tspan4517-1-6-8-0">Guided configuration</tspan></text>
- </g>
-</svg>
diff --git a/wiki/src/blueprint/test_suite:_getting_rid_of_the_jruby_mess.mdwn b/wiki/src/blueprint/test_suite_getting_rid_of_the_jruby_mess.mdwn
index 61558a0..61558a0 100644
--- a/wiki/src/blueprint/test_suite:_getting_rid_of_the_jruby_mess.mdwn
+++ b/wiki/src/blueprint/test_suite_getting_rid_of_the_jruby_mess.mdwn
diff --git a/wiki/src/blueprint/touchpad.mdwn b/wiki/src/blueprint/touchpad.mdwn
new file mode 100644
index 0000000..796e41b
--- /dev/null
+++ b/wiki/src/blueprint/touchpad.mdwn
@@ -0,0 +1,33 @@
+[[!toc levels=2]]
+
+What others do
+==============
+
+* Fedora 19 Live (probably the default settings in recent GNOME):
+ - no tap to click
+ - two finger scroll
+ - no disable while typing
+
+* Ubuntu 13.10:
+ - tap to click
+ - two finger scroll
+ - disable while typing
+
+* Debian Live 7.2 desktop:
+ - no tap to click
+ - edge scrolling
+ - no disable while typing
+ - no horizontal scrolling
+
+* Debian sid (December, 2013):
+ - no tap to click
+ - two finger scroll
+ - no disable while typing
+ - no horizontal scrolling
+
+* some recent version of OSX:
+ - tap to click
+ - two finger scroll
+
+* Windows: XXX
+
diff --git a/wiki/src/blueprint/web_browser_profile_with_no_CA.mdwn b/wiki/src/blueprint/web_browser_profile_with_no_CA.mdwn
index 53bd01f..40b82f4 100644
--- a/wiki/src/blueprint/web_browser_profile_with_no_CA.mdwn
+++ b/wiki/src/blueprint/web_browser_profile_with_no_CA.mdwn
@@ -50,3 +50,13 @@ What does not work is to disable this module for the no-CAs profile
using:
modutil -dbdir PROFILE_DIR -disable "NSS Internal PKCS #11 Module"
+
+The Freepto folks are working on wrappers around `certutil`:
+
+* <http://lists.autistici.org/message/20141013.235706.2496a2bc.en.html>
+* <https://github.com/boyska/freepto-lb/blob/certificates_iceweasel/config/hooks/certificates.chroot>
+* <https://github.com/vinc3nt/freepto-lb/blob/master/tools/certmanage.sh>
+
+Adding a CA can [be done with an
+add-on](https://github.com/moba/cacert-firefox-addon).
+Presumably removing or distrusting one can too.
diff --git a/wiki/src/blueprint/website_homepage.mdwn b/wiki/src/blueprint/website_homepage.mdwn
new file mode 100644
index 0000000..67cf19c
--- /dev/null
+++ b/wiki/src/blueprint/website_homepage.mdwn
@@ -0,0 +1,37 @@
+[[!meta title="Website homepage"]]
+
+Notes taken during the Summit 2014.
+
+- Menu to different sections
+ - Discover
+ - User
+ - Contributor
+- What is Tails
+- Key features
+ - Small all-in-one device
+ - Preconfigured for privacy and security
+ - Out-of-the-box
+ - Free software: trustable (and gratis)
+ - Secure system in unsecure environment
+ - Run on most laptop and desktop computers
+ - Leave no trace
+ - Emergency shutdown
+ - Adaptable to your needs
+ - All-in-one security toolbox
+ - Offline mode
+- Screencast, tour
+- Key tools
+ - Encrypted storage and configuration (only when you want it) : persistence
+ - Secure instant messaging : Pidgin + OTR
+ - Encrypted emails : Claws + GPG
+ - Anonymous browsing : Torbrowser
+ - Censorship circumvention
+ - Windows camouflage
+ - Office and multimedia work
+ - Password management (maybe)
+- Testimonials
+ - Journalists
+ - Activists
+ - Privacy concerned people
+- Use cases
+- Keep in touch
diff --git a/wiki/src/blueprint/website_structure.mdwn b/wiki/src/blueprint/website_structure.mdwn
new file mode 100644
index 0000000..3496404
--- /dev/null
+++ b/wiki/src/blueprint/website_structure.mdwn
@@ -0,0 +1,165 @@
+[[!meta title="Website structure"]]
+
+During the card sorting workshop conducted in the [[Tails Hackfest
+2014|HackFest_2014_Paris]], the three following proposal of structure for the
+website were drafted.
+
+[[!toc]]
+
+Proposal 1
+==========
+
+This proposal has two main sections, with four subsections each, which go from
+less involvement in the project (first contact) to more involvement in the
+project (dev).
+
+- User documentation
+ - First contact
+ - Is Tails the right tool for me?
+ - About (simplified)
+ - License
+ - Minimal documentation
+ - Getting started
+ - Warnings
+ - Download
+ - Installation
+ - ISO verification
+ - Detailed documentation
+ - Features and included software
+ - Report an error (simple way)
+ - Contact info for users
+ - Known issues
+ - User documentation
+ - Support
+ - Technical user
+ - OpenPGP keys and policy
+ - Security announcements
+ - Report an error (good way)
+ - Release notes
+ - FAQ
+- Development
+ - Getting involved
+ - Contributing to Tails
+ - Donate
+ - Mailing lists
+ - Easy tasks for new contributors
+ - Design documents
+ - Community
+ - News
+ - Calendar
+ - Meeting notes
+ - Finances
+ - Contribute
+ - Building the wiki
+ - Internationalisation tricks
+ - Git repositories
+ - Contact info for contributors
+ - Slides
+ - Dev
+ - Tails roadmap
+ - Building a Tails image
+ - Release process
+ - Release schedule
+ - Blueprint
+ - Changes in the next release
+
+- Talking about
+ - Public relations
+ - Acknowledgements
+ - Related projects
+ - Promote
+ - Media appearances
+ - Press information
+ - Advertising material
+
+Proposal 2
+==========
+
+This proposal has three main sections: discover, user, and contributors.
+
+- Discover
+ - News
+ - News
+ - Press information
+ - Media appearances
+ - What
+ - About
+ - Advertising material
+ - Acknowledgement
+ - Features and included software
+ - Getting started...
+ - Slides
+ - Is Tails the right tool for me?
+ - FAQ
+ - Install
+ - Warnings
+ - Known issues
+ - Installation
+ - Download
+ - ISO verification
+ - *Unsorted*
+ - Report an error
+- Users
+ - News
+ - Security announcements
+ - Release notes
+ - Next release changes
+ - How to use
+ - User documentation
+ - Contact info for users
+ - OpenPGP keys and policy
+ - Error
+ - Tails user support mailing lists
+ - Support
+ - Known issues
+ - *Unsorted*
+ - Donate
+ - Finances
+- Contributers
+ - Contact
+ - Contact info for contributors
+ - Mailing lists
+ - Meeting notes
+ - Dev
+ - Tails roadmap
+ - Blueprint
+ - Release schedule
+ - Release process
+ - *Unsorted*
+ - Redmine
+ - Contributing to Tails
+ - Calendar
+ - Internationalisation tricks
+ - License
+ - Design documents
+ - Building the wiki
+ - Git repositories
+ - Building a Tails image
+
+Proposal 3
+==========
+
+The overall structure of this proposal was unfinished.
+
+- Press information
+- Media appearances
+- About
+ - Is Tails the right tool for me?
+ - Contact info for users
+- Acknowledgements
+ - License
+ - Related projects
+- Finances
+ - Donate
+- OpenPGP keys and policy
+- News
+- Download
+ - Security announcements
+ - ISO verification
+ - Installation
+ - Getting started...
+ - Release notes
+ - Known issues
+ - Next release changes
+ - Tails roadmap
+
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index 9ce82a5..51f4ff4 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: 2014-05-01 10:40+0300\n"
+"POT-Creation-Date: 2014-11-30 02:25+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"
@@ -416,10 +416,14 @@ msgid "[[Release schedule|contribute/release_schedule]]"
msgstr "[[Veröffentlichungskalender|contribute/release_schedule]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Release process|contribute/release_process]]\n"
+#| " - [[Manual test suite|contribute/release_process/test]]\n"
msgid ""
" - [[Release process|contribute/release_process]]\n"
" - [[Manual test suite|contribute/release_process/test]]\n"
+" - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
msgstr ""
" - [[Veröffentlichungsprozess|contribute/release_process]]\n"
" - [[Manuelle Tests|contribute/release_process/test]]\n"
@@ -462,10 +466,17 @@ msgstr ""
"Arbeitsbesprechungen etc."
#. type: Bullet: ' - '
-msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
+#, fuzzy
+#| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
+msgid ""
+"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
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.fr.po b/wiki/src/contribute.fr.po
index b737ec5..e7439cb 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: 2014-05-01 10:40+0300\n"
+"POT-Creation-Date: 2014-11-30 02:25+0100\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,6 +38,9 @@ msgid ""
"<h2>Share your experience</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
msgstr ""
+"<div class=\"contribute-roles-1\">\n"
+"<h2>Partagez votre expérience</h2>\n"
+"<div class=\"contribute-role\" id=\"user\">\n"
#. type: Plain text
#, no-wrap
@@ -45,19 +48,7 @@ msgid " [[!img user.png link=no]]\n"
msgstr ""
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<div class=\"contribute-roles-1\">\n"
-#| "<h2>User</h2>\n"
-#| "<div class=\"contribute-role\" id=\"user\">\n"
-#| " <p>Every user can help others or provide developers with useful information.</p>\n"
-#| " <ul>\n"
-#| " <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-#| " <li>[[Provide needed input to developers|contribute/how/input]]</li>\n"
-#| " <li>[[Help other Tails users|contribute/how/help]]</li>\n"
-#| " </ul>\n"
-#| "</div>\n"
-#| "</div>\n"
+#, no-wrap
msgid ""
" <p>Every user can help others or provide developers with useful information.</p>\n"
" <ul>\n"
@@ -69,13 +60,10 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-"<div class=\"contribute-roles-1\">\n"
-"<h2>Utilisateur</h2>\n"
-"<div class=\"contribute-role\" id=\"user\">\n"
-" <img src=\"user.svg\" />\n"
" <p>Tout utilisateur peut aider les autres ou fournir des informations utiles aux développeurs.</p>\n"
" <ul>\n"
" <li>[[Rapporter des erreurs|doc/first_steps/bug_reporting]]</li>\n"
+" <li>[[Tester des images ISO expérimentales|contribute/how/testing]]</li>\n"
" <li>[[Fournir des informations nécessaires aux développeurs|contribute/how/input]]</li>\n"
" <li>[[Aider les autres utilisateurs de Tails|contribute/how/help]]</li>\n"
" </ul>\n"
@@ -89,6 +77,9 @@ msgid ""
"<h2>Donate</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
msgstr ""
+"<div class=\"contribute-roles-1\">\n"
+"<h2>Faire un don</h2>\n"
+"<div class=\"contribute-role\" id=\"donate\">\n"
#. type: Plain text
#, no-wrap
@@ -96,17 +87,7 @@ msgid " [[!img donate.png link=no]]\n"
msgstr ""
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<div class=\"contribute-roles-1\">\n"
-#| "<h2>Donate</h2>\n"
-#| "<div class=\"contribute-role\" id=\"donate\">\n"
-#| " <p>Donating speeds up the development of Tails.</p>\n"
-#| " <ul>\n"
-#| " <li>[[Make a donation|contribute/how/donate]]</li>\n"
-#| " </ul>\n"
-#| "</div>\n"
-#| "</div>\n"
+#, no-wrap
msgid ""
" <p>Donating speeds up the development of Tails.</p>\n"
" <ul>\n"
@@ -115,11 +96,7 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-"<div class=\"contribute-roles-1\">\n"
-"<h2>Donner</h2>\n"
-"<div class=\"contribute-role\" id=\"donate\">\n"
-" <img src=\"donate.svg\" />\n"
-" <p> Faire un don accélère le développement de Tails.</p>\n"
+" <p>Faire un don accélère le développement de Tails.</p>\n"
" <ul>\n"
" <li>[[Faire un don|contribute/how/donate]]</li>\n"
" </ul>\n"
@@ -134,6 +111,10 @@ msgid ""
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Writer</h3>\n"
msgstr ""
+"<div class=\"contribute-roles-3\">\n"
+"<h2>Faire bénéficier de vos compétences linguistiques</h2>\n"
+"<div class=\"contribute-role\" id=\"content-writer\">\n"
+" <h3>Writer</h3>\n"
#. type: Plain text
#, no-wrap
@@ -152,6 +133,14 @@ msgid ""
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Translator</h3>\n"
msgstr ""
+" <p>De bons rédacteurs peuvent rendre Tails accessible à plus de personnes.</p>\n"
+" <ul>\n"
+" <li>[[Améliorer la documentation|contribute/how/documentation]]</li>\n"
+" <li>[[Écrire des revues de presse|contribute/how/promote]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"translator\">\n"
+" <h3>Traducteur</h3>\n"
#. type: Plain text
#, no-wrap
@@ -169,6 +158,13 @@ msgid ""
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Speaker</h3>\n"
msgstr ""
+" <p>Des traducteurs peuvent permettre à plus de gens de part le monde d'utiliser Tails.</p>\n"
+" <ul>\n"
+" <li>[[Améliorer Tails dans votre langue|contribute/how/translate]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"speaker\">\n"
+" <h3>Orateur</h3>\n"
#. type: Plain text
#, no-wrap
@@ -185,6 +181,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>Des orateurs peuvent recommander Tails à toute sorte d'audience.</p>\n"
+" <ul>\n"
+" <li>[[Parler lors d'événements|contribute/how/promote]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -194,6 +196,10 @@ msgid ""
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>Developer or maintainer</h3>\n"
msgstr ""
+"<div class=\"contribute-roles-3\">\n"
+"<h2>Contributer avec vos compétences informatiques</h2>\n"
+"<div class=\"contribute-role\" id=\"developer\">\n"
+" <h3>Développeur ou mainteneur</h3>\n"
#. type: Plain text
#, no-wrap
@@ -212,6 +218,14 @@ msgid ""
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>System administrator</h3>\n"
msgstr ""
+" <p>Des développeurs logiciels avec diverses compétences peuvent améliorer Tails.</p>\n"
+" <ul>\n"
+" <li>[[Travailler sur le code source|contribute/how/code]]</li>\n"
+" <li>[[Améliorer Tails en travaillant sur Debian|contribute/how/debian]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"sysadmin\">\n"
+" <h3>Administrateur système</h3>\n"
#. type: Plain text
#, no-wrap
@@ -230,6 +244,14 @@ msgid ""
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>Designer</h3>\n"
msgstr ""
+" <p>Des administrateurs système peuvent participer à l'infrastructure derrière Tails.</p>\n"
+" <ul>\n"
+" <li>[[Faire tourner un miroir HTTP|contribute/how/mirror]]</li>\n"
+" <li>[[Améliorer l'infrastructure de Tails|contribute/how/sysadmin]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"designer\">\n"
+" <h3>Designer</h3>\n"
#. type: Plain text
#, no-wrap
@@ -248,6 +270,14 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>Des designers peuvent rendre Tails plus facile à utiliser et plus attirant.</p>\n"
+" <ul>\n"
+" <li>[[Améliorer le site web|contribute/how/website]]</li>\n"
+" <li>[[Graphisme|contribute/how/graphics]]</li>\n"
+" <li>[[Améliorer l'interface utilisateur de Tails|contribute/how/user_interface]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -370,6 +400,7 @@ msgstr ""
msgid ""
" - [[Release process|contribute/release_process]]\n"
" - [[Manual test suite|contribute/release_process/test]]\n"
+" - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
msgstr ""
#. type: Plain text
@@ -407,7 +438,12 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
+msgid ""
+"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[contribute/Low-hanging_fruit_sessions]]"
msgstr ""
#. type: Bullet: ' - '
@@ -437,295 +473,9 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Talk with us\n"
-msgstr ""
+msgstr "Nous contacter\n"
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
msgstr ""
-
-#, fuzzy
-#~| msgid ""
-#~| "<div class=\"contribute-roles-3\">\n"
-#~| "<h2>Contribute with your language skills</h2>\n"
-#~| "<div class=\"contribute-role\" id=\"content-writer\">\n"
-#~| " <h3>Writer</h3>\n"
-#~| " <p>Good writers can make Tails accessible to more people.</p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Improve documentation|contribute/how/documentation]]</li>\n"
-#~| " <li>[[Write press releases|contribute/how/promote]]</li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "<div class=\"contribute-role\" id=\"translator\">\n"
-#~| " <h3>Translator</h3>\n"
-#~| " <p>Translators can allow more people around the world to use Tails.</"
-#~| "p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Improve Tails in your own language|contribute/how/translate]]</"
-#~| "li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "<div class=\"contribute-role\" id=\"speaker\">\n"
-#~| " <h3>Speaker</h3>\n"
-#~| " <p>Speakers can advocate Tails to all kinds of public.</p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Talk at events|contribute/how/promote]]</li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "</div>\n"
-#~ msgid ""
-#~ "<div class=\"contribute-roles-3\">\n"
-#~ "<h2>Contribute with your language skills</h2>\n"
-#~ "<div class=\"contribute-role\" id=\"content-writer\">\n"
-#~ " <h3>Writer</h3>\n"
-#~ " <img src=\"writer.svg\" />\n"
-#~ " <p>Good writers can make Tails accessible to more people.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Improve documentation|contribute/how/documentation]]</li>\n"
-#~ " <li>[[Write press releases|contribute/how/promote]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"translator\">\n"
-#~ " <h3>Translator</h3>\n"
-#~ " <img src=\"translator.svg\" />\n"
-#~ " <p>Translators can allow more people around the world to use Tails.</"
-#~ "p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Improve Tails in your own language|contribute/how/translate]]</"
-#~ "li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"speaker\">\n"
-#~ " <h3>Speaker</h3>\n"
-#~ " <img src=\"speaker.svg\" />\n"
-#~ " <p>Speakers can advocate Tails to all kinds of public.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Talk at events|contribute/how/promote]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "</div>\n"
-#~ msgstr ""
-#~ "<div class=\"contribute-roles-3\">\n"
-#~ "<h2>Participer grâce à vos compétences linguistiques</h2>\n"
-#~ "<div class=\"contribute-role\" id=\"content-writer\">\n"
-#~ " <h3>Écrire</h3>\n"
-#~ " <p>Une bonne plume peut rendre Tails accessible à davantage de monde.</"
-#~ "p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Améliorer la documentation|contribute/how/documentation]]</li>\n"
-#~ " <li>[[Écrire des communiqués de presse|contribute/how/promote]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"translator\">\n"
-#~ " <h3>Traduire</h3>\n"
-#~ " <p>Les traductions permettent à davantage de monde d'utiliser Tails.</"
-#~ "p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Améliorer Tails dans votre propre langue|contribute/how/"
-#~ "translate]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"speaker\">\n"
-#~ " <h3>Parler</h3>\n"
-#~ " <p>Parler de Tails permet de le faire connaitre à toutes sortes de "
-#~ "publics.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Parler lors d'événements|contribute/how/promote]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "</div>\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "<div class=\"contribute-roles-3\">\n"
-#~| "<h2>Contribute with your technical skills</h2>\n"
-#~| "<div class=\"contribute-role\" id=\"developer\">\n"
-#~| " <h3>Software developer</h3>\n"
-#~| " <p>Developers with very diverse skills can improve Tails code.</p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Fix a bug|contribute/how/code]]</li>\n"
-#~| " <li>[[Implement a feature|contribute/how/code]]</li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "<div class=\"contribute-role\" id=\"sysadmin\">\n"
-#~| " <h3>System administrator</h3>\n"
-#~| " <p>System administrators can contribute to the infrastructure behind "
-#~| "Tails.</p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Run a BitTorrent seed|contribute/how/mirror]]</li>\n"
-#~| " <li>[[Run a HTTP mirror|contribute/how/mirror]]</li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "<div class=\"contribute-role\" id=\"designer\">\n"
-#~| " <h3>Designer</h3>\n"
-#~| " <p>Designers can make Tails easier to use and more appealing.</p>\n"
-#~| " <ul>\n"
-#~| " <li>[[Improve the website|contribute/how/website]]</li>\n"
-#~| " <li>[[Design graphics|contribute/how/graphics]]</li>\n"
-#~| " <li>[[Improve the Tails user interface|contribute/how/"
-#~| "user_interface]]</li>\n"
-#~| " </ul>\n"
-#~| "</div>\n"
-#~| "</div>\n"
-#~ msgid ""
-#~ "<div class=\"contribute-roles-3\">\n"
-#~ "<h2>Contribute with your computer skills</h2>\n"
-#~ "<div class=\"contribute-role\" id=\"developer\">\n"
-#~ " <h3>Developer or maintainer</h3>\n"
-#~ " <img src=\"software_developer.svg\" />\n"
-#~ " <p>Software people with very diverse skills can improve Tails.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Fix a bug|contribute/how/code]]</li>\n"
-#~ " <li>[[Implement a feature|contribute/how/code]]</li>\n"
-#~ " <li>[[Improve Tails by working on Debian|contribute/how/debian]]</"
-#~ "li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"sysadmin\">\n"
-#~ " <h3>System administrator</h3>\n"
-#~ " <img src=\"system_administrator.svg\" />\n"
-#~ " <p>System administrators can contribute to the infrastructure behind "
-#~ "Tails.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Run a BitTorrent seed|contribute/how/mirror]]</li>\n"
-#~ " <li>[[Run a HTTP mirror|contribute/how/mirror]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"designer\">\n"
-#~ " <h3>Designer</h3>\n"
-#~ " <img src=\"designer.svg\" />\n"
-#~ " <p>Designers can make Tails easier to use and more appealing.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Improve the website|contribute/how/website]]</li>\n"
-#~ " <li>[[Design graphics|contribute/how/graphics]]</li>\n"
-#~ " <li>[[Improve the Tails user interface|contribute/how/user_interface]]"
-#~ "</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "</div>\n"
-#~ msgstr ""
-#~ "<div class=\"contribute-roles-3\">\n"
-#~ "<h2>Participer grâce à vos compétences techniques</h2>\n"
-#~ "<div class=\"contribute-role\" id=\"developer\">\n"
-#~ " <p>Toutes sortes de compétences techniques peuvent contribuer à "
-#~ "améliorer Tails.</p>\n"
-#~ " <h3>Développement logiciel</h3>\n"
-#~ " <ul>\n"
-#~ " <li>[[Corriger un bug|contribute/how/code]]</li>\n"
-#~ " <li>[[Implémenter une fonctionnalité|contribute/how/code]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"sysadmin\">\n"
-#~ " <h3>Administration système</h3>\n"
-#~ " <p>Les administrateurs systèmes peuvent participer à l'infrastructure "
-#~ "sur laquelle repose Tails.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Faire tourner un mirroir BitTorrent|contribute/how/mirror]]</"
-#~ "li>\n"
-#~ " <li>[[Faire tourner un mirroir HTTP|contribute/how/mirror]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "<div class=\"contribute-role\" id=\"designer\">\n"
-#~ " <h3>Designer</h3>\n"
-#~ " <p>Un bon design peut rendre Tails plus attirant et plus facile à "
-#~ "utiliser.</p>\n"
-#~ " <ul>\n"
-#~ " <li>[[Améliorer le site web|contribute/how/website]]</li>\n"
-#~ " <li>[[Participer au graphisme|contribute/how/graphics]]</li>\n"
-#~ " <li>[[Améliorer l'interface graphique pour l'utilisateur|contribute/"
-#~ "how/user_interface]]</li>\n"
-#~ " </ul>\n"
-#~ "</div>\n"
-#~ "</div>\n"
-
-#~ msgid "There are many ways **you** can contribute to Tails."
-#~ msgstr "**Vous** pouvez contribuer à Tails de diverses façons."
-
-#~ msgid "Design\n"
-#~ msgstr "Design\n"
-
-#~ msgid "Other design documentation:"
-#~ msgstr "Autre documentation de conception :"
-
-#~ msgid "[[!map pages=\"contribute/design/*\"]]\n"
-#~ msgstr "[[!map pages=\"contribute/design/*\"]]\n"
-
-#~ msgid "Tools\n"
-#~ msgstr "Outils\n"
-
-#~ msgid "Source code\n"
-#~ msgstr "Code source\n"
-
-#~ msgid "You can [[fetch Tails source code using Git|contribute/git]]."
-#~ msgstr ""
-#~ "Vous pouvez [[obtenir le code source de Tails en utilisant Git|contribute/"
-#~ "git]]."
-
-#~ msgid "Bugtracker\n"
-#~ msgstr "Suivie de bug\n"
-
-#~ msgid ""
-#~ "Tails tasks are managed in Redmine at [[!tails_redmine \"\" desc=\"labs."
-#~ "riseup.net\"]]."
-#~ msgstr ""
-#~ "Les tâches de Tails sont gérées dans Redmine chez [[!tails_redmine \"\" "
-#~ "desc=\"labs.riseup.net\"]]."
-
-#~ msgid "Tails heavy tasks are often [[drafted as blueprints|blueprint]]."
-#~ msgstr ""
-#~ "Les tâches importantes sont souvent [[rédigées sous forme de plan "
-#~ "(*blueprint*)|blueprint]]."
-
-#~ msgid "Other development pages\n"
-#~ msgstr "Autres pages de développement\n"
-
-#~ msgid ""
-#~ "\t[[!map pages=\"contribute/* and !contribute/design and !contribute/"
-#~ "design/* and !contribute/how and !contribute/how/*\"]]\n"
-#~ msgstr ""
-#~ "\t[[!map pages=\"contribute/* and !contribute/design and !contribute/"
-#~ "design/* and !contribute/how and !contribute/how/*\"]]\n"
-
-#~ msgid "[[Make a donation|contribute/how/donate]]"
-#~ msgstr "[[Faire un don|contribute/how/donate]]"
-
-#~ msgid "[[Test our release candidates|contribute/how/testing]]"
-#~ msgstr "[[Tester nos Release Candidates|contribute/how/testing]]"
-
-#~ msgid "[[Run a BitTorrent or HTTP mirror|contribute/how/mirror]]"
-#~ msgstr ""
-#~ "[[Faire tourner un mirroir BitTorrent ou HTTP|contribute/how/mirror]]"
-
-#~ msgid "[[Help other Tails users|contribute/how/help]]"
-#~ msgstr "[[Aider d'autres utilisateurs de Tails|contribute/how/help]]"
-
-#~ msgid "[[Improve documentation|contribute/how/documentation]]"
-#~ msgstr "[[Améliorer la documentation|contribute/how/documentation]]"
-
-#~ msgid "[[Report bugs|doc/first_steps/bug_reporting]]"
-#~ msgstr "[[Rapporter des Bugs|doc/first_steps/bug_reporting]]"
-
-#~ msgid "[[Spread the word|contribute/how/promote]]"
-#~ msgstr "[[Promouvoir Tails|contribute/how/promote]]"
-
-#~ msgid "[[Fix a bug|contribute/how/code]]"
-#~ msgstr "[[Proposer un correctif|contribute/how/code]]"
-
-#~ msgid "[[Implement a feature|contribute/how/code]]"
-#~ msgstr "[[Développer une fonctionnalité|contribute/how/code]]"
-
-#~ msgid ""
-#~ "[[Translate: improve Tails in your own language|contribute/how/translate]]"
-#~ msgstr ""
-#~ "[[Traduire : améliorer Tails dans votre propre langue|contribute/how/"
-#~ "translate]]"
-
-#~ msgid "[[Provide needed input to developers|contribute/how/input]]"
-#~ msgstr "[[Apporter de l'aide aux développeurs|contribute/how/input]]"
-
-#~ msgid ""
-#~ "<a href=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-"
-#~ "dev@boum.org\">bugs that we are interested in on the Debian BTS</a>"
-#~ msgstr ""
-#~ "<a href=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-"
-#~ "dev@boum.org\">Bugs qui nous intéressent sur Debian BTS</a>"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index e4964c9..f6388a4 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -148,6 +148,7 @@ Release cycle
- [[Release schedule|contribute/release_schedule]]
- [[Release process|contribute/release_process]]
- [[Manual test suite|contribute/release_process/test]]
+ - [[Automated test suite|contribute/release_process/test/automated_tests]]
<a id="upstream"></a>
@@ -163,7 +164,8 @@ Collective process
==================
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- - [[Meetings|contribute/meetings]], and minutes from past meetings
+ - [[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 a7ef79d..d8a66f6 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: 2014-05-13 14:35+0300\n"
+"POT-Creation-Date: 2014-11-30 02:25+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"
@@ -24,8 +24,15 @@ msgid "[[!meta title=\"Contributing to Tails\"]]\n"
msgstr "[[!meta title=\"Contribuindo com o Tails\"]]\n"
#. type: Plain text
-msgid "There are many ways you can contribute to Tails. No effort is too small and whatever you bring to this community will be appreciated. So read on to find out how you can make a difference in Tails."
-msgstr "Há muitas maneiras de contribuir com o Tails. Nenhum esforço é pequeno demais e qualquer coisa que você traga para esta comunidade será apreciada. Então, continue lendo para descobrir como você pode fazer a diferença no Tails."
+msgid ""
+"There are many ways you can contribute to Tails. No effort is too small and "
+"whatever you bring to this community will be appreciated. So read on to "
+"find out how you can make a difference in Tails."
+msgstr ""
+"Há muitas maneiras de contribuir com o Tails. Nenhum esforço é pequeno "
+"demais e qualquer coisa que você traga para esta comunidade será apreciada. "
+"Então, continue lendo para descobrir como você pode fazer a diferença no "
+"Tails."
#. type: Plain text
#, no-wrap
@@ -317,8 +324,14 @@ msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
#. type: Plain text
-msgid "This section is only in English, because there is currently no way to contribute to Tails if you do not understand English."
-msgstr "<strong>Nota:</strong> outras páginas nesta sessão não estão traduzidas para outros idiomas além do inglês, uma vez que elas não documentam formas de contribuir com o Tails nas quais não seja necessário um entendimento mínimo da língua inglesa. Desculpe-nos por isso."
+msgid ""
+"This section is only in English, because there is currently no way to "
+"contribute to Tails if you do not understand English."
+msgstr ""
+"<strong>Nota:</strong> outras páginas nesta sessão não estão traduzidas para "
+"outros idiomas além do inglês, uma vez que elas não documentam formas de "
+"contribuir com o Tails nas quais não seja necessário um entendimento mínimo "
+"da língua inglesa. Desculpe-nos por isso."
#. type: Plain text
#, no-wrap
@@ -407,10 +420,14 @@ msgid "[[Release schedule|contribute/release_schedule]]"
msgstr "[[Agenda de lançamento|contribute/release_schedule]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Release process|contribute/release_process]]\n"
+#| " - [[Manual test suite|contribute/release_process/test]]\n"
msgid ""
" - [[Release process|contribute/release_process]]\n"
" - [[Manual test suite|contribute/release_process/test]]\n"
+" - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
msgstr ""
" - [[Processo de lançamento|contribute/release_process]]\n"
" - [[Conjunto de testes manuais|contribute/release_process/test]]\n"
@@ -444,20 +461,36 @@ msgid "Collective process\n"
msgstr "Processo coletivo\n"
#. type: Bullet: ' - '
-msgid "[[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc."
-msgstr "[[Calendário|contribute/calendar]] de lançamentos, reuniões, sessões de trabalho, etc."
+msgid ""
+"[[Calendar|contribute/calendar]] of releases, meetings, working sessions, "
+"etc."
+msgstr ""
+"[[Calendário|contribute/calendar]] de lançamentos, reuniões, sessões de "
+"trabalho, etc."
#. type: Bullet: ' - '
-msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
+#, fuzzy
+#| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
+msgid ""
+"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr "[[Reuniões|contribute/meetings]], e notas de reuniões passadas"
#. type: Bullet: ' - '
-msgid "[[Marking a task as easy|contribute/working_together/criteria_for_easy_tasks]]"
-msgstr "[[Marcando uma tarefa como fácil|contribute/working_together/criteria_for_easy_tasks]]"
+msgid "[[contribute/Low-hanging_fruit_sessions]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Marking a task as easy|contribute/working_together/"
+"criteria_for_easy_tasks]]"
+msgstr ""
+"[[Marcando uma tarefa como fácil|contribute/working_together/"
+"criteria_for_easy_tasks]]"
#. type: Bullet: ' - '
msgid "[[Document progress|contribute/working_together/document_progress]]"
-msgstr "[[Documentação de progresso|contribute/working_together/document_progress]]"
+msgstr ""
+"[[Documentação de progresso|contribute/working_together/document_progress]]"
#. type: Plain text
#, no-wrap
@@ -486,4 +519,3 @@ msgstr "Fale conosco\n"
#, no-wrap
msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index 5aa2005..b3affe8 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -11,22 +11,96 @@ Tails can be built easily in a virtual machine using [Rake], [Vagrant] and
[VirtualBox]. The process requires a minimum of 1 GB of free memory and a
maximum of 10 GB of free storage.
-Installing the needed tools on Debian Wheezy is a matter of:
-
- $ sudo apt-get install virtualbox vagrant rake
-
[Rake]: http://rake.rubyforge.org/
[Vagrant]: http://vagrantup.com/
[VirtualBox]: http://www.virtualbox.org/
-Then, please run:
+## Installing the dependencies in Debian
+
+### If you run Debian Jessie
+
+1. Add Debian unstable to your APT sources:
+
+ echo "deb http://ftp.us.debian.org/debian/ unstable main" | \
+ sudo tee /etc/apt/sources.list.d/unstable.list
+
+2. Pin all packages from Debian unstable at 500 (`apt_preferences(5)`):
+
+ sudo tee /etc/apt/preferences.d/unstable <<EOF
+ Package: *
+ Pin: release o=Debian,a=unstable
+ Pin-Priority: 500
+ EOF
+
+3. Install the needed tools:
+
+ sudo apt-get install git virtualbox rake ruby-childprocess \
+ ruby-erubis ruby-i18n ruby-log4r ruby-net-scp ruby bsdtar curl
+
+### If you run Debian Wheezy
+
+1. Add Debian Jessie, unstable and wheezy-backports to your APT sources:
+
+ echo "deb http://ftp.us.debian.org/debian/ jessie main" | \
+ sudo tee /etc/apt/sources.list.d/jessie.list
+ echo "deb http://ftp.us.debian.org/debian/ unstable main" | \
+ sudo tee /etc/apt/sources.list.d/unstable.list
+ echo "deb http://ftp.us.debian.org/debian/ wheezy-backports main" | \
+ sudo tee /etc/apt/sources.list.d/wheezy-backports.list
+
+2. Pin all packages from Debian Jessie and unstable at 500 (`apt_preferences(5)`):
+
+ sudo tee /etc/apt/preferences.d/jessie <<EOF
+ Package: *
+ Pin: release o=Debian,a=jessie
+ Pin-Priority: 500
+ EOF
+ sudo tee /etc/apt/preferences.d/unstable <<EOF
+ Package: *
+ Pin: release o=Debian,a=unstable
+ Pin-Priority: 500
+ EOF
+
+3. Install the needed tools:
- $ git clone git://git.tails.boum.org/tails
- $ cd tails
- $ git checkout devel
- $ export TAILS_BUILD_OPTIONS="noproxy"
- $ rake build
- $ unset TAILS_BUILD_OPTIONS
+ sudo apt-get install git virtualbox rake ruby-childprocess/jessie \
+ ruby-net-scp/jessie ruby-erubis ruby-i18n ruby-log4r bsdtar curl \
+ gettext/wheezy-backports
+
+### In both Debian Wheezy and Jessie
+
+At the moment Tails relies on a version of Vagrant (the 1.4.x series)
+that is not packaged in Debian any more. Here's a workaround for both
+Debian Wheezy and Jessie:
+
+ sudo tee /etc/apt/preferences.d/vagrant-1.4.3 <<EOF
+ Package: vagrant
+ Pin: version 1.4.3+dfsg1-3
+ Pin-Priority: 550
+
+ Package: ruby-net-ssh
+ Pin: version 1:2.6.8-2
+ Pin-Priority: 550
+ EOF
+ echo "deb http://snapshot.debian.org/archive/debian/20141010T042049Z/ unstable main" | \
+ sudo tee /etc/apt/sources.list.d/20141010T042049Z.list
+ sudo apt-get -o Acquire::Check-Valid-Until=false update
+ sudo apt-get install vagrant ruby-net-ssh
+ sudo rm /etc/apt/sources.list.d/20141010T042049Z.list
+ sudo apt-get update
+
+## Building Tails using Vagrant
+
+Once all dependencies are installed, get the Tails sources and
+checkout the development branch:
+
+ git clone git://git.tails.boum.org/tails
+ cd tails
+ git checkout devel
+
+Build Tails using Vagrant:
+
+ rake build
The first time, this can take a little while to download the base virtual
machine from Tails mirror (around 300 MB). It will then boot the machine,
@@ -36,7 +110,7 @@ should appear in the current directory.
After you are done working on Tails, do not forget to shut the virtual
machine down:
- $ rake vm:halt
+ rake vm:halt
One may also want to [[contribute/customize]] their image before building.
@@ -49,7 +123,7 @@ If you have a local HTTP proxy, the build system will use it as long as
you properly set the `http_proxy` environment variable. The easiest way to
do so is to run:
- $ export http_proxy=http://proxy.lan:3142
+ export http_proxy=http://proxy.lan:3142
This needs to be done before any other operations.
@@ -65,16 +139,16 @@ The following options are available:
### Memory build settings
Tails builds way faster when everything is done in memory. If your computer
-runs Linux and happens to have more than 6.5 GB of free memory before you
+runs Linux and happens to have more than 7 GB of free memory before you
start the virtual machine, it will automatically switch to 'build in RAM'
mode.
To force a specific behaviour please set:
- * **ram**: start the virtual machine with 6.5GB of memory, build Tails
+ * **ram**: start the virtual machine with 7 GB of memory, build Tails
inside a `tmpfs`. Build fails if the system is not in a proper state to
do so.
- * **noram**: start the virtual machine with 1GB of memory if not already
+ * **noram**: start the virtual machine with 512 MB of memory if not already
done, build Tails using the virtual machine hard disk.
### HTTP proxy settings
@@ -201,6 +275,7 @@ The following Debian packages need to be installed:
libyaml-syck-perl` so that the wiki builds smoothly.
* `dpkg-dev`
* `intltool`
+* `gettext` 0.18.3 or newer, available in wheezy-backports
Configure live-build
--------------------
@@ -216,9 +291,12 @@ Build process
Every build command must be run as `root`, at the root of a clone of the
[[`tails` repository|git]].
-In short, a build could be done using:
+In short, a build shall be done using:
- # lb clean --all && lb config && lb build
+ lb clean --all && lb config && lb build
+
+Running `lb config` or `lb build` in an environment that wasn't full
+cleaned first is not supported.
### Customize the build process if needed
@@ -233,23 +311,13 @@ The most common customizations are documented on this wiki:
build environment;
* [[using a custom Debian mirror to build Tails
images|build/custom_mirror]];
-* [[using squid-deb-proxy to build Tails images|build/squid-deb-proxy]].
+* [[using squid-deb-proxy to build Tails images|build/squid-deb-proxy]]
+ (**Note**: most Tails contributors using the manual build method
+ use [[!debpts apt-cacher-ng]] instead, nowadays.)
More documentation about this can be found in the [Debian Live
Manual](http://live.debian.net/manual-2.x/html/live-manual.en.html).
-### Initialize the Live system's configuration
-
-Initialize the Live system's configuration with `lb config` in a
-**clean** build tree. Most `lb config` options are supported, have a
-look to the `lb_config(1)` manpage for details.
-
-### Build the system
-
-You can then use the standard live-build commands as root to build
-the image (`lb build`) and to cleanup the build directory (`lb
-clean`).
-
More information
================
diff --git a/wiki/src/contribute/build/website.mdwn b/wiki/src/contribute/build/website.mdwn
index 5b8623b..e7d5d8b 100644
--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -4,7 +4,7 @@ Here is how to build the wiki offline.
First, install the dependencies:
- apt-get install libyaml-perl libyaml-libyaml-perl po4a \
+ sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
perlmagick libyaml-syck-perl ikiwiki
Clone our main [[Git repository|git]]:
@@ -18,3 +18,6 @@ Then run the following command, at the root of the Git folder:
You can now browse the files in
./config/chroot_local-includes/usr/share/doc/tails/website/
+
+To accelerate the build, you can disable some languages by editing the
+parameter `po_slave_languages` in ikiwiki.setup.
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 340afd9..95efa93 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,34 +1,35 @@
[[!meta title="Calendar"]]
-* 2014-07-01: Feature freeze for 1.1. Tag, build and upload 1.1~rc1
- ISO.
+* 2014-12-02:
+ - TBB 4.x TBB 4.x based on Firefox 31.3.0esr is *hopefully* out
+ (notice the [one week delay](https://groups.google.com/forum/#!topic/mozilla.dev.platform/1McXdXSurZQ)
+ for this Firefox release)
+ - Tag 1.2.1 in Git
+ - Build and upload 1.2.1 ISO and IUKs
-* 2014-07-02: Test Tails 1.1~rc1.
+* 2014-12-03:
+ - Test (early CEST) and release (late CEST) Tails 1.2.1
+ - [[Monthly meeting|contribute/meetings]]
-* 2014-07-03: Officially release Tails 1.1~rc1.
+* 2014-12-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2014-07-05--2014-07-06 - Tails hackfest at
- [IRILL](http://www.irill.org/) (Paris, France)
+* 2015-01-03: [[Monthly meeting|contribute/meetings]]
-* 2014-07-08--2014-07-11 - Tails contributors meeting
+* 2015-01-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2014-07-20: Package and upload Firefox 24.7.0 ESR. Tag, build and
- upload 1.1 ISO.
+* 2015-01-14: Release 1.2.2. anonym is RM.
-* 2014-07-21: Test Tails 1.1.
+* 2015-02-03: [[Monthly meeting|contribute/meetings]]
-* 2014-07-22: Officially release Tails 1.1.
+* 2015-03-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2014-09-02: Release Tails 1.1.1. intrigeri does the first ~half of
- the RM duty, anonym takes over around 2014-08-20.
+* 2015-02-17: Release 1.3. Still undecided who will be RM, but anonym
+ probably can do it.
-* 2014-10-14: Release Tails 1.2. anonym is RM.
+* 2015-03-03: [[Monthly meeting|contribute/meetings]]
-* 2014-11-25: Release 1.2.1. anonym is RM.
+* 2015-03-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2015-01-06: Release 1.2.2. anonym is RM. If Mozilla decides to send
- their employees on vacation, delaying the Firefox ESR release for a
- week or two, anonym can still be RM.
+* 2015-03-31: Release 1.3.1.
-* 2015-02-17: Release 1.3. Still undecided who will be RM, but anonym
- probably can do it.
+* 2015-05-15: Release 1.4.
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index f90681c..9396496 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -247,14 +247,11 @@ portable and able to run in as many environments as possible.
### 2.4.1 Platform
-XXX: update
-
The binaries MUST all be executable on the most common computer
-hardware architecture(s). As of 2011, the x86 computer architecture
+hardware architecture(s). As of 2014, the x86 computer architecture
seems to be the obvious choice as the vast majority of personal
-computers in use is compatible with it. Supporting the PowerPC
-architecture is a welcome bonus in order to support pre-Intel Apple
-computers. Supporting widespread hardware architectures used in mobile
+computers in use is compatible with it. The PELD SHOULD support UEFI.
+Supporting widespread hardware architectures used in mobile
computers, such as phones, is also welcome.
### 2.4.2 Media
@@ -682,7 +679,7 @@ fitness for a particular purpose, including total anonymity. Anonymity
depends not only on the software but also on the user understanding
the risks involved and how to manage those risks.
-Other Tails design documents:
+## 3.0 Other Tails design documents
[[!map pages="contribute/design/*"]]
@@ -745,9 +742,9 @@ See [[doc/about/features]].
## 3.3 Internationalization
Tails ships, as is, localization files provided by the installed
-Debian packages. All available iceweasel localization packages
+Debian packages. All available Tor Browser localization packages
are installed. Spell checking software and data is installed for the
-set of best supported languages; it is usable at least is Iceweasel,
+set of best supported languages; it is usable at least is Tor Browser,
LibreOffice and gedit.
### 3.3.1 Input methods
@@ -945,77 +942,52 @@ granting `sudo` privileges to the `amnesia` user by default.
Unless an administrator password is set in tails-greeter,
no root access is possible afterwards.
-### 3.6.13 Iceweasel
-
-(Note: Iceweasel is the name of the web browser, based on Mozilla
-Firefox, that is shipped by Debian and thus by Tails.)
-
-Tails ships custom Iceweasel ESR packages built with the Torbrowser
-patches to better blend in the Tor Browser Bundle's anonymity set.
-Some patches, that are not relevant for Tails, are not
-applied, though: see the Tails browser's
-[changelog](https://git-tails.immerda.ch/iceweasel/plain/debian/changelog?h=tails/master)
-for the current status.
-
-Iceweasel uses the Torbutton extension in order to prevent attacks
-using JavaScript, plugins and other non-HTTP features like web
-bugs. It is configured to always be enabled on Iceweasel start and
-uses Tor as SOCKS5 proxy. SOCKS is configured to perform name
-resolution through this proxy. Iceweasel is also configured to not
-cache to disk (mainly to reduce memory usage for DVD users as disk
-writes will be stored there), history is disabled (just in case) and
-many other things. It is also set up not to automatically check for
-updates of its installed extensions. Java support is disabled.
-
-Iceweasel is shipped with some extensions to help users manage their
-browsing experience. The Torbutton settings treat all cookies as
-session cookies by default. This prevents the
-known leak of browsing information cookies can lead to. The [Adblock
-plus](https://addons.mozilla.org/fr/firefox/addon/1865/) extension
-protects against many tracking possibilities by removing most ads.
-
-Tails ships the [HTTPS
-Everywhere](https://www.eff.org/https-everywhere) extension that
-forces HTTPS usage for requests to a number of major websites.
-
-Tails also ships the
-[FoxyProxy](https://addons.mozilla.org/fr/firefox/addon/2464/)
-extension that:
-
-- allows using I2P instead of Tor to visit eepsites (I2P's own hidden
- services look-alike); see [[the design document dedicated to Tails
- use of I2P|I2P]] for details;
-- could help [[!tails_todo FTP_in_Iceweasel desc="fixing Iceweasel's FTP support"]].
-
-Thanks to Torbutton, to the Tor Browser patches, and to us importing
-(most of) the TBB preferences, Iceweasel is configured so that Tor browser
-fingerprint appears uniformly among Torbutton users. Tails enables
-Torbutton's EN-US locale spoofing to avoid partitioning Tails
-users into per-language anonymity sets.
-
-Torbutton is also configured to spoof the timezone settings the same
-way as the Tor Browser Bundle does, i.e. to `UTC+00:00`.
-
-Thanks to the Tor Browser patches, the in-memory web cache is isolated
-to the url bar origin.
-
-The Iceweasel config is poorly commented but the commit messages in
-Git history explains it all. In a nutshell, Iceweasel preferences are
-set in various ways:
-
-* A Tor Browser patch called
- `0022-Tor-Browser-s-Firefox-preference-overrides.patch` bundles
- their prefs directly into `omni.ja`.
-* `/etc/iceweasel/*/*.js` contains:
- - Torbutton preferences that the TBB also sets;
- - some Tails-specific settings.
-
-Whenever the user tries to start Iceweasel before Tor is ready, they
-are informed it won't work, and asked whether to start the browser
-anyway:
-
-- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/iceweasel]]
-- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tor-has-bootstrapped]]
+### 3.6.13 Tor Browser
+
+Tails ships with the Tor Browser, which is based on Mozilla Firefox
+and patched by the Tor Project for improved anonymity by reducing
+information leaks, decreasing attack surface and similar. The actual
+binaries etc. used in Tails are those distributed by the Tor Project,
+but the configuration differs slightly, which is described below.
+
+In Tails we diverge from the TBB's one-profile-only design, and
+install the Tor Browser in a globally accessible directory used by all
+browser profiles (and other XUL applications).
+
+- [[!tails_gitweb config/chroot_local-hooks/10-tbb]]
+
+The default profile is split from the binaries and application data:
+
+- [[!tails_gitweb_dir config/chroot_local-includes/etc/tor-browser]]
+
+As for extensions we have the following differences:
+
+* Tails also installs the
+ [Adblock plus](https://addons.mozilla.org/fr/firefox/addon/1865/)
+ extension to protect against many tracking possibilities by removing
+ most ads.
+
+* Tails does not install the same Torbutton as in the TBB. We
+ installed a patched version.
+
+* Tails does not install the Tor Launcher extension as part of the
+ browser. A patched Tor Launcher is installed for use as a
+ stand-alone XUL application, though.
+
+In Tails we do not use the `start-tor-browser` script, since it does a
+lot of stuff not needed in Tails (error checking mainly) and isn't
+flexible since it looks for the browser profile in a specific
+place. Our custom script makes use of the global installation and also
+makes sure the default profile is used as a basis. Any shared libraries
+shipped inside the TBB are also used (via `LD_LIBRARY_PATH`) since
+Debian stable often has too old versions to start the browser.
+
+Whenever the user tries to start the Tor Browser before Tor is
+ready, they are informed it won't work, and asked whether to start the
+browser anyway:
+
+- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/tor-browser]]
+- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/generate-tor-browser-profile]]- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tor-has-bootstrapped]]
- [[!tails_gitweb config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped]]
Once Tor is ready to be used, the user is informed they can now use
@@ -1023,17 +995,21 @@ the Internet:
- [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh]]
-Source code, scripts and configuration:
+The remaining configuration differences can be found in:
-- [[!tails_gitweb_dir config/chroot_local-includes/etc/iceweasel]]
-- Tails' Iceweasel source [[lives in Git|contribute/git]]
-- [[!tails_gitweb config/chroot_local-hooks/12-remove_unwanted_iceweasel_searchplugins]]
-- [[!tails_gitweb config/chroot_local-hooks/13-iceweasel_sqlite]]
+- [[!tails_gitweb_dir config/chroot_local-includes/etc/tor-browser/preferences/0000tails.js]]
+- [[!tails_gitweb config/chroot_local-hooks/12-install_browser_searchplugins]]
+- [[!tails_gitweb config/chroot_local-hooks/12-remove_unwanted_browser_searchplugins]]
- [[!tails_gitweb config/chroot_local-hooks/13-override-tbb-branding]]
-- [[!tails_gitweb config/chroot_local-hooks/14-add_localized_iceweasel_searchplugins]]
-- [[!tails_gitweb config/chroot_local-hooks/14-generate-iceweasel-profile]]
+- [[!tails_gitweb config/chroot_local-hooks/14-add_localized_browser_searchplugins]]
+- [[!tails_gitweb config/chroot_local-hooks/14-generate-tor-browser-profile]]
- [[!tails_gitweb config/chroot_local-hooks/15-symlink-places.sqlite]]
+It should also be noted that the global TBB installation is also used
+for the [[Unsafe Browser]] and [[I2P Browser]], although they are
+user-isolated and use separate profiles with very different
+configurations.
+
### 3.6.14 Claws Mail
Claws Mail generates `Message-ID` headers using the hostname part of
@@ -1154,6 +1130,77 @@ encrypt and decrypt text, and to verify OpenPGP signatures.
- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/gpgApplet]]
+### 3.6.23 DHCP hostname leaks
+
+Tails prevents dhclient from sending the hostname over the network.
+
+First, only the `keyfile` NetworkManager plugin is used; that is, the
+`ifupdown` plugin is disabled:
+
+* this is needed, because the only the `keyfile` plugin supports
+ setting `dhcp-send-hostname` to false, while the `ifupdown` plugin
+ retrieves the hostname to send from `/etc/hostname`;
+* this is OK, because we actually don't use the functionality provided
+ by the `ifupdown` plugin (that is, reading from
+ `/etc/network/interfaces` -- that only configures the loopback
+ connection in Tails, which is itself ignored by NetworkManager
+ anyway).
+
+Second, the NetworkManager `keyfile` plugin is configured to *not*
+send the hostname over DHCP by default. Likely this can be overridden
+on a per-connection basis if one really needs to change this.
+
+Third, dhclient itself is told not to send the hostname. This is
+needed because on Wheezy, NetworkManager runs dhclient with the `-cf
+/var/run/nm-dhclient-eth0.conf` option, and generates that file by
+concatenating `/etc/dhcp/dhclient.conf` with its own settings.
+
+Fourth, dhclient is told to override any hostname provided by the DHCP
+server with `amnesia`. This is meant to prevent dhclient hooks,
+NetworkManager and others from setting the hostname to a value
+controlled by the DHCP server.
+
+* [[!tails_gitweb config/chroot_local-patches/dhcp-dont-send-hostname.diff]]
+
+### 3.6.24 TCP timestamps
+
+[[!rfc 1323 desc="TCP time stamps"]] allow for tracking clock
+information with millisecond resolution. This may or may not allow an
+attacker to learn information about the system clock at such
+a resolution, depending on various issues such as network lag.
+This information is available to anyone who monitors the network
+somewhere between the attacked Tails system and the Tor entry nodes
+being used. It may allow an attacker to find out how long a given
+Tails system has been running, and to distinguish several Tails
+systems running behind NAT and using the same IP address. It might
+also allow to look for clocks that match an expected value to find the
+public IP used by a user.
+
+Hence, Tails disables this feature.
+
+- [[!tails_gitweb config/chroot_local-includes/etc/sysctl.d/tcp_timestamps.conf]]
+
+Note that TCP time stamps normally have some usefulness. They are
+needed for:
+
+* the TCP protection against wrapped sequence numbers; however, to
+ trigger a wrap, one needs to send roughly 2^32 packets in one
+ minute: as said in [[!rfc 1700]], "The current recommended default
+ time to live (TTL) for the Internet Protocol (IP) [45,105] is 64".
+ So, we don't think this is a practical problem in the context
+ of Tails.
+
+* "Round-Trip Time Measurement", which is only useful when the user
+ manages to saturate their connection. When using Tails, we believe
+ that the limiting factor for transmission speed is rarely the
+ capacity of the user connection.
+
+### 3.6.25 Application isolation
+
+Tails has some minimal [[contribute/design/application_isolation]] to
+mitigate a bit the consequences of security issues in individual
+applications being exploited by attackers.
+
## 3.7 Running Tails in virtual machines
### 3.7.1 Current support
@@ -1199,20 +1246,22 @@ the [[contribute/build]] page and the [[contribute]] section on the wiki.
### 3.8.2 Testing process
-An automated build and test environment would be useful to avoid
+An automated build and test environment is useful to avoid
regressions in Tails, especially anonymity and security related
-ones. It would also make it easier to work on Tails for developers
-who do not own modern powerful hardware.
+ones. It also makes it easier for developers to work on Tails with
+more confidence, and at release time to cut down the time needed for
+quality assurance work.
-Research and practical work to set up such an environment [[!tails_todo
-automated_builds_and_tests desc="has slowly started"]]. In the meantime, a [[manual
-test suite|contribute/release_process/test]] is "run" against Tails
-release candidates images before they are officially published.
+Tails' [[manual test suite|contribute/release_process/test]] is "run"
+against Tails release candidates images before they are officially
+published. Automating this test suite is [[partly
+done|contribute/release_process/test/automated_tests]], and a work
+in progress.
### 3.8.3 Upgrades
Keeping Tor (stable releases only, unless the Tor core developers
-recommend otherwise) and Iceweasel up-to-date is a priority.
+recommend otherwise) and the Tor Browser up-to-date is a priority.
Remaining applications, including the base system, will be upgraded
using Debian standard upgrade process, and generally based on the
@@ -1249,7 +1298,8 @@ UDP and IPv6 are a problem. The Tor network does not support any of
those yet. Outgoing UDP and IPv6 packets are dropped altogether by
netfilter for this reason.
-Support of arbitrary DNS queries is only provided by ttdnsd listening
+Support of [[!tails_ticket 6070 desc="arbitrary DNS queries"]] is only
+provided by ttdnsd listening
on 127.0.0.2. ttdnsd has proved too be far too buggy to be inserted in
the default DNS resolution chain.
@@ -1267,11 +1317,11 @@ where Tails is heading to.
Tails tries to make it as difficult as possible to distinguish Tails
users from other Tor users.
-Iceweasel is configured to match the fingerprint of the Tor Browser
+The Tor Browser used in Tails is configured to match the fingerprint of the Tor Browser
Bundle and the known differences, if any, are listed in the [[known
issues|support/known_issues]] page.
-However the fact that different extensions are installed in Tails and in
+However the fact that different browser extensions are installed in Tails and in
the TBB surely allows more sophisticated attacks that usual fingerprint
as returned by tools such as <https://panopticlick.eff.org/> and
<http://ip-check.info/>. For example, the fact that Adblock is removing
diff --git a/wiki/src/contribute/design/I2P.mdwn b/wiki/src/contribute/design/I2P.mdwn
index 789d584..ac989ea 100644
--- a/wiki/src/contribute/design/I2P.mdwn
+++ b/wiki/src/contribute/design/I2P.mdwn
@@ -11,10 +11,17 @@ be able to access eepsites from Tails.
Versions
========
-[I2P](https:/geti2p.net) has been included since Tails v0.7 with Iceweasel
+[I2P](https:/geti2p.net) has been included since Tails 0.7 with Iceweasel
preconfigured using FoxyProxy so that eepsites (`.i2p` TLD) are directed to
I2P. All other traffic gets routed through Tor.
+Starting with Tails 1.1.1, I2P is not enabled by default when Tails starts.
+In order to use I2P, a user must add the <span class="command">i2p</span> boot option
+to the <span class="application">boot menu</span>.
+
+Starting with Tails 1.2, I2P sites are accessed with the [[I2P Browser]].
+FoxyProxy is no longer installed in the Tor Browser..
+
<a id="design"></a>
Design
@@ -35,9 +42,9 @@ started automatically. Some reasons behind this decision include:
3. some level of system compromise through 0-day exploits in the I2P
client
-Users that want to use I2P must start it manually from the `Applications` menu.
-In the future one may be able to start I2P during boot (see the [[!tails_todo
-boot_menu]] TODO page).
+Users that want to use I2P must enable it by addinng the <span class="command">i2p</span> boot option
+to the <span class="application">boot menu</span>. Once enabled, I2P will be started automatically by a NetworkManager hook
+(see [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/dispatcher.d/30-i2p.sh]]).
Implementation
==============
@@ -50,16 +57,16 @@ some years ago. This package includes an initscript which is configured by
default to start the I2P client as the `i2psvc` user.
The above package is installed but its init script is not automatically run
-during boot. Instead, an I2P shortcut has been added to the applications
-menu which the user can use to start the I2P init script manually. A
-side-effect of installing the actual I2P program into /usr is that
-automatic updates are disabled by the program since the installation
-directory is not writable by the `i2psvc` user.
+during boot. Instead, a NetworkManager hook will start I2P if the user
+specified "i2p" at the boot menu. A side-effect of installing the actual I2P
+program into /usr is that automatic updates are disabled by the program since
+the installation directory is not writable by the `i2psvc` user.
For better performance an exception has been made in the [[firewall
configuration|Tor_enforcement/Network_filter]] that grants direct access to the
network for the I2P user running the client so it can reach the I2P
-network directly, both through TCP and UDP.
+network directly, both through TCP and UDP. I2P is explicitly blocked from
+communicating with the LAN.
The I2P router is configured to run in hidden mode: killing I2P
ungracefully is bad for the I2P network, and this is most likely
@@ -73,70 +80,41 @@ this is a good reason to enable hidden mode, that is to disable
participating in I2P traffic:
[[!tails_gitweb config/chroot_local-hooks/16-i2p_config]].
-[[!tails_todo iceweasel_addon_-_FoxyProxy desc="FoxyProxy"]] has been installed
-system-wide, and the default iceweasel profile provides with a
-configuration handling the I2P integration. FoxyProxy's whitelist
-filter is used to make sure that the corresponding urls will be
-proxied appropriately.
-
-Below are the patterns that each url handeled by iceweasel will be
-matched against. These patterns will be tried in order, from top to
-bottom, until the first match is found:
-
-1. The I2P router console: urls matching the `http://127.0.0.1:7657/*` wildcard
- pattern will get a direct connection to the local host so the I2P
- router console can be reached.
+Starting with Tails 1.2, I2P *eepsites* are accessed via the [[I2P Browser]], a
+modification of the [[Unsafe Browser]]'s setup scripts. See [[its page|I2P Browser]]
+for more information.
-2. The local *eepsite*: urls matching the `http://127.0.0.1:7658/*` wildcard
- pattern will get a direct connection to the local host so the locally
- hosted eepsite can be reached.
-3. I2P eepsites: urls matching the
- `^https?://[-a-zA-Z0-9.]+\.i2p(:[0-9]{1,5})?(/.*)?$` regexp will be
- proxied through the local eepsite HTTP proxy run by the I2P client.
- Implementation note: FoxyProxy encloses the regexps between `^` and
- `$` itself since `isMultiLine="false"`, that's why the regexp in
- `foxyproxy.xml` lacks these chars.
+Disabling / Enabling I2P
+========================
-4. Tor HTTP(s): urls matching one of the `https://*` and `http://*`
- wildcard patterns will be proxied through polipo (and then its
- parent proxy, Tor).
+During the build process, [[!tails_gitweb config/chroot_local-hooks/97-remove_i2p]]
+moves I2P from its normal location at `/usr/share/i2p` to `/usr/share/tails/i2p-disabled`.
+The script [[!tails_gitweb config/chroot_local-includes/lib/live/config/2080-install-i2p]]
+checks for the string `i2p` in the kernel command line. If it is found, everything moved by
+[[!tails_gitweb config/chroot-local_hooks/97-remove_i2p]] is undone, making I2P available in the system.
-5. The rest: all remaining urls will be SOCKS5-proxied through Tor.
-
-Also, do note that Tails' [[netfilter-based
-blocking|Tor_enforcement/Network_filter]] ensures that no Internet
-traffic can be escape both Tor or I2P (and thus be non-anonymous) even
-if something is wrong in the above filters (or a future revision).
Ports allowed through the firewall
==================================
Services on I2P are accessed through tunnels built by I2P. Services that a user
hosts, such as an *eepsite* or *IRC Server* are accessed remotely via **Server Tunnels**.
-End users will access services using *client tunnels*. I2P is shipped with a
+End users will access services using **client tunnels**. I2P is shipped with a
few tunnels preconfigured and the ports that they use have exceptions added to
-ferm. These ports include:
-
-* 2727, BOB: [BOB](https://geti2p.net/bob) is an application bridge allowing
- non-Java clients to interact with I2P.
-* 4444, I2P HTTP Proxy: Used to access sites with the `.i2p` TLD
-* 4445, HTTPS Outproxy tunnel: Disabled in by default in Tails in
- [I2PTunnel](http://127.0.0.1:7657/i2ptunnel) since all HTTPS traffic in Tails
- gets routed through Tor.
+ferm. The ports accessible to the `amnesia` user include:
+
* 6668, Tunnel to Irc2P: Used to connect to the main I2P-only IRC network
* 7656, [SAM](https://geti2p.net/sam): SAM is an application bridge allowing
non-Java clients to use I2P. More information:
[SAMv1](https://geti2p.net/samv1), [SAMv2](https://geti2p.net/samv2),
-* 7657, I2P router console: The router console is accessible in the web browser at <http://127.0.0.1:7657>
-* 7658, local 'eepsite': Each I2P installation is configured out of the box
- with the possibility to host one's own website (or *eepsite*) on the I2P
- network. The eepsite will not be acessible remotely unless its
- [tunnel](http://127.0.0.1:7657/i2ptunnel#localServerTunnelList) is started.
* 7659, SMTP Proxy: Tunnel to `smtp.postman.i2p`. More information is available from within I2P at [Postman's HQ](http://hq.postman.i2p/?page_id=10)
* 7660, POP3 Proxy: Tunnel to `pop3.postman.i2p`. More information is available from within I2P at [Postman's HQ](http://hq.postman.i2p/?page_id=11)
* 8998, MTN Proxy: Tunnel to `mtn.i2p2.i2p`, a [Monotone](http://monotone.ca) server.
+Note: These ports will only be opened if the user explicitly requests I2P at the boot prompt.
+See [[!tails_gitweb config/chroot_local-includes/etc/ferm/ferm.conf]] for details.
+
Features that require an administration password
================================================
@@ -150,6 +128,18 @@ will not be an issue unless one wants to
In order to utilize these features users need to set an
[[doc/first_steps/startup_options/administration_password]].
+Changes from upstream
+=====================
+
+* i2cp, allowing java clients to communicate with I2P from outside of the JVM, is disabled
+* IPv6 is disabled
+* Outproxies are disabled
+* HiddenMode is set for all users
+* Updating I2P from within the I2P network is disabled; updates are done using the .debs
+* Inbound connections are disabled
+* I2P plugins are disabled
+* The webapp `susimail` will leave mail on the server
+
Package source and upgrading I2P
================================
@@ -157,9 +147,15 @@ Tails uses the I2P (and deps)
[Debian packages prepared by KillYourTV](http://deb.i2p2.no/), the official I2P
Linux package maintainer as listed on the [I2P Team page](https://geti2p.net/team).
The I2P source package and its binaries are imported into to our own
-[[APT repository|APT_repository]] into the devel or stable suite. The suite
+[[APT repository|APT_repository]] into the devel or stable suite. The suite
will depend on whether a major- or point-release is being prepared.
+## Prepare a Git topic branch
+
+Create a Git branch, forked off the branch into which the new packages
+shall eventually be imported into, and called e.g.
+`feature/i2p-0.n.m`. Push this branch.
+
## Check the binary packages
### Content
@@ -175,27 +171,26 @@ will depend on whether a major- or point-release is being prepared.
### Maintainer scripts
-Have a look at `*.{pre,post}{inst,rm}`.
+Have a look at `*.{pre,post}{inst,rm}` and `*.configure` maintainer
+scripts in each binary package.
## Import the packages
1. scp the source and binary packages to incoming.deb.tails.boum.org
1. move the uploaded files somewhere, and set permissions on it, so
that the `reprepro` user can read it
-1. use `reprepro includesrc` to import the source package(s)
-1. use `reprepro includedeb` to import the binary package(s)
+1. use `reprepro includedsc` to import the source package(s) into the
+ APT suite dedicated to the Git topic branch create above (e.g.
+ `feature-i2p-0.n.m`)
+1. use `reprepro includedeb` to import the binary package(s) into the
+ same dedicated APT suite
+1. build an ISO from the Git branch created above
+1. test this ISO
+1. merge the Git branch and APT suite as appropriate
Things to meditate upon
=======================
-* Pattern 4 will catch ftp://.* and redirect them to Tor through
- SOCKS5. This effectively breaks FTP completely, so there's room for
- adding a pattern above number 4 which matches ftp connections
- (i.e. `^ftp://.*`) and proxies them through some ftp proxy using Tor
- as its parent proxy. See [[!tails_todo FTP_in_Iceweasel]]. As an addition,
- at the moment (versions <=0.8) ftp does not work in I2P for
- technical reasons, so no pattern for that is needed.
-
* Do we want to enable the "Hidden mode" which completely disables
participating traffic?
@@ -216,7 +211,3 @@ Things to meditate upon
- there's no "cover-traffic", which may decrease the anonymity
somewhat.
-
-* Are the patterns used above correct for their intended purposes?
- Does the FoxyProxy setup in any way open up for attacks? See
- [[!tails_todo iceweasel_addon_-_FoxyProxy]].
diff --git a/wiki/src/contribute/design/I2P_Browser.mdwn b/wiki/src/contribute/design/I2P_Browser.mdwn
new file mode 100644
index 0000000..37e44ee
--- /dev/null
+++ b/wiki/src/contribute/design/I2P_Browser.mdwn
@@ -0,0 +1,56 @@
+
+Allowed Access
+==============
+
+The HTTP Proxy is set to 127.0.0.1 on port 4444 with an exception made for
+http://127.0.0.1 which does not go through the proxy. With this set-up, only eepsites (`.i2p`
+TLD), offline Tails documentation, and the router console are acessible from I2P Browser.
+
+Also, do note that Tails' [[netfilter-based
+blocking|Tor_enforcement/Network_filter]] ensures that no Internet
+traffic can escape I2P (and thus be non-anonymous), even if something is
+wrong in the above filters (or a future revision).
+
+Ports allowed through the firewall
+==================================
+
+I2P is shipped with several preconfigured tunnels, and the ports used have had
+exceptions added to ferm. The ports accessible by the i2pbrowser user include:
+
+* 4444, I2P HTTP Proxy: Used to access sites with the `.i2p` TLD
+* 7657, I2P router console: The router console is accessible in the web browser at <http://127.0.0.1:7657>
+* 7658, local 'eepsite': Each I2P installation is configured out of the box
+ with the possibility to host one's own website (or *eepsite*) on the I2P
+ network. The eepsite will not be acessible remotely unless its
+ [tunnel](http://127.0.0.1:7657/i2ptunnel#localServerTunnelList) is started.
+
+Note: These ports will only be opened if the user explicitly requests I2P at the boot prompt.
+See [[!tails_gitweb config/chroot_local-includes/etc/ferm/ferm.conf]] for details.
+
+Security
+========
+
+The I2P Browser is run by a separate `i2pbrowser` user, which is only allowed
+to make TCP connections to the ports explicitly mentioned above. DNS lookups
+are prohibited.
+
+The I2P Browser is run inside a chroot consisting of a throw away
+aufs union between a read-only version of the pre-boot Tails
+filesystem, and a tmpfs as the rw branch. Hence, the post-boot
+filesystem (which contains all user data) isn't available to the
+I2P Browser within the chroot. The chroot and aufs union is created
+upon I2P Browser start, and is torn down after it exits, forcefully
+killing any remaining processes run from inside it.
+
+It should be noted that chroots are pretty weak jails, so an exploit
+could easily escape it and have access to the complete filesystem (as
+restricted for the `i2pbrowser` user). Hence, the reason for using a
+chroot is not for that purpose, but for separating its configuration from the rest of the Tails system.
+
+Code
+----
+
+* [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/i2p-browser]]
+* [[!tails_gitweb config/chroot_local-includes/usr/share/applications/i2p.desktop.in]]
+* [[!tails_gitweb chroot_local-includes/lib/live/config/2080-install-i2p]
+* [[!tails_gitweb config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme]]
diff --git a/wiki/src/contribute/design/MAC_address.mdwn b/wiki/src/contribute/design/MAC_address.mdwn
index 938e06f..43733e6 100644
--- a/wiki/src/contribute/design/MAC_address.mdwn
+++ b/wiki/src/contribute/design/MAC_address.mdwn
@@ -376,15 +376,15 @@ Scripts:
### Potential for blocking the desktop
-The call of `udev settle` may block for up to 120 seconds (the default
+The call of `udevadm settle` may block for up to 120 seconds (the default
timeout) during Tails Greeter's PostLogin in case of some broken
hardware and/or crappy udev rules. In other words, the Tails desktop
may be blocked for this long, without any notification.
If this turns out to be a problem (currently it's only guesswork) we
-could make two `udev settle`:s, one with a short timeout (10 seconds)
+could make two `udevadm settle`:s, one with a short timeout (10 seconds)
and if it fails we show a notification and optimistically start
-another `udev settle` *in* *a* *sub-shell* so it doesn't block the
+another `udevadm settle` *in* *a* *sub-shell* so it doesn't block the
Tails desktop from starting any more.
For more, see this sub-thread on tails-dev:
@@ -412,7 +412,13 @@ leaks issue, in addition to other reasons for being discarded:
* NetworkManager hook: NM doesn't trigger events equivalent to
if-pre-up, so this isn't possible. See the commented parts in:
- /etc/NetworkManager/dispatcher.d/01ifupdown
+ `/etc/NetworkManager/dispatcher.d/01ifupdown`. Note that
+ NetworkManager 0.9.10 introduces pre-up hooks, *but* they're used to
+ "allow scripts to execute before NetworkManager announces
+ connectivity to applications" (according to a [blog
+ post](http://blogs.gnome.org/dcbw/2014/06/20/well-build-a-dream-house-of-net/)
+ by Dan William), that is, after network activity (e.g.
+ DHCP requests) has already occurred.
* systemd integration: We don't use this yet.
diff --git a/wiki/src/contribute/design/Tor_enforcement/Network_filter.mdwn b/wiki/src/contribute/design/Tor_enforcement/Network_filter.mdwn
index a7aeaff..33c4226 100644
--- a/wiki/src/contribute/design/Tor_enforcement/Network_filter.mdwn
+++ b/wiki/src/contribute/design/Tor_enforcement/Network_filter.mdwn
@@ -2,7 +2,7 @@ One serious security issue is that we don't know what software will
attempt to contact the network and whether their proxy settings are
set up to use the Tor SOCKS proxy or polipo HTTP(s) proxy correctly.
This is solved by blocking all outbound Internet traffic except Tor
-and I2P, and explicitly configure all applications to use either of
+(and I2P when enabled), and explicitly configure all applications to use either of
these.
- [[!tails_gitweb config/chroot_local-includes/etc/ferm/ferm.conf]]
@@ -20,16 +20,17 @@ connections originating from the `debian-tor` Unix user.
#### I2P
-[I2P](http://www.i2pproject.net/) (*Invisible Internet Project*) is
+[I2P](https://geti2p.net/) (*Invisible Internet Project*) is
yet another anonymizing network
(load-balanced unspoofable packet switching network) that provides
access to eepsites (.i2p tld); eepsites are a bit like Tor hidden
services. Some users would like to be able to access eepsites from
Tails.
-Like the `debian-tor` user, the `i2p` user is allowed to connect
-*directly* to the Internet. See [[the design document dedicated to
-Tails use of I2P|I2P]] for details.
+Like the `debian-tor` user, the `i2psvc` user is allowed to connect
+*directly* to the Internet. Any rules granting the `i2psvc`user access are only
+applied if the user explicitly enables I2P at the boot prompt. See
+[[the design document dedicated to Tails use of I2P|I2P]] for details.
#### Unsafe Browser and the `clearnet` user
@@ -37,6 +38,13 @@ The `clearnet` user used to run the
[[contribute/design/Unsafe_Browser]] is granted full network access
(but no loopback access) in order to deal with captive portals.
+#### I2P Browser and the `i2pbrowser` user
+
+The [[contribute/design/I2P_Browser]] is run by the `i2pbrowser` user. This
+account is granted access to ports 4444, 7657, and 7658 on the loopback device *if*
+I2P is enabled at the boot prompt. Sites outside of I2P cannot be reached by
+the `i2pbrowser` user.
+
#### Local Area Network (LAN)
Tails short description talks of sending through Tor *outgoing
diff --git a/wiki/src/contribute/design/Unsafe_Browser.mdwn b/wiki/src/contribute/design/Unsafe_Browser.mdwn
index b79ec39..6eae7d6 100644
--- a/wiki/src/contribute/design/Unsafe_Browser.mdwn
+++ b/wiki/src/contribute/design/Unsafe_Browser.mdwn
@@ -14,8 +14,8 @@ Internet access seem required for avoiding this problem.
Requirements
============
-* It must run a completely separate Iceweasel profile from the
- Torified browser's.
+* It must run a completely separate browser profile from the
+ Torified browser.
* It must be hard to start by mistake.
* It must be hard to mistake for the Torified browser.
* It must be configured to use the DNS provided by DHCP (which is required
@@ -42,8 +42,8 @@ when started:
0. Show a dialog asking the user for verification, while also briefly
explaining that the Unsafe Browser won't be anonymous.
0. "No" is the default answer, but if "Yes", we start a separate
- Iceweasel instance.
-0. Iceweasel is configured to use a theme with scary colors (red). To
+ browser instance.
+0. The browser is configured to use a theme with scary colors (red). To
not raise suspicion the scary theme is not used when Windows
camouflage is activated, but instead the normal Internet Explorer
theme is used.
diff --git a/wiki/src/contribute/design/application_isolation.mdwn b/wiki/src/contribute/design/application_isolation.mdwn
new file mode 100644
index 0000000..1c9b5b7
--- /dev/null
+++ b/wiki/src/contribute/design/application_isolation.mdwn
@@ -0,0 +1,266 @@
+[[!meta title="Application isolation"]]
+
+[[!toc levels=3]]
+
+Goals
+=====
+
+For now, we are only aiming at filesystem resources isolation: that
+is, making sure that e.g. Pidgin cannot read the GnuPG keyring.
+
+Other types of resources, such as signals, X, ptrace, sockets, D-Bus
+etc. are [[not part of the isolation goals
+yet|application_isolation#more-resources]].
+
+Tools and basic configuration
+=============================
+
+For now, we have decided to use AppArmor to isolate applications,
+mostly because:
+
+* it is simple: AppArmor policy is relatively easy to understand,
+ improve, and audit;
+* it is the best supported [[!wikipedia mandatory access control]]
+ framework in Debian; it wasn't too hard to reach this point, and
+ there is quite some room for improvement via collaboration with
+ other distributions, most notably Ubuntu.
+
+The [[!debpts apparmor]] package is installed, and AppArmor is
+[[!tails_gitweb config/amnesia desc="enabled on the kernel
+command-line"]].
+
+Confinement profiles
+====================
+
+The AppArmor confinement profiles included in Tails come from:
+
+* individual Debian packages that ship confinement profiles, e.g.
+ Tor and Vidalia;
+* the [[!debpts apparmor-profiles]] package;
+* the [[!debpts apparmor-profiles-extra]] package.
+
+To get the full and current list, run `aa-status` as `root`
+inside Tails.
+
+Hacks to support the Live system usecase
+========================================
+
+Most Live systems use a union filesystem to provide the operating
+system with a read-write filesystem, based on a read-only branch
+(typically, SquashFS) and a read-write one (most often, tmpfs).
+
+Unfortunately, AppArmor currently does not support union filesystems
+very well, because the LSM hooks do not allow it to distinguish
+between an access to the upper layer, and an access to the loop-backed
+underlying layer.
+
+So, we have to adjust profiles a bit to make them support the paths
+that are actually seen by AppArmor in the context of Tails:
+
+* [[!tails_gitweb config/chroot_local-patches/apparmor-adjust-home-tunable.diff]]
+* [[!tails_gitweb config/chroot_local-patches/apparmor-adjust-tor-profile.diff]]
+* [[!tails_gitweb config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff]]
+
+Below, we discuss various leads that might avoid the need for coming
+up with such adjustments, and maintaining it.
+
+Future work
+===========
+
+More confinement profiles
+-------------------------
+
+As part of the [[!debwiki AppArmor desc="Debian AppArmor Team"]], we
+are working to get more well-tested and maintained profiles integrated
+into the distribution, and to improve cross-distribution collaboration
+in this area.
+
+<a id="more-resources"></a>
+
+Isolating more types of resources
+---------------------------------
+
+Once AppArmor 2.9 is released and the corresponding kernel patches are
+merged into Linux mainline, we will get support for mediating many
+more types of resources: D-Bus calls, sockets, signals and so on.
+
+[[Linux containers|application_isolation#linux-containers]] may also
+be a good way to isolate more types of resources.
+
+Using alias rules to avoid modifying profiles
+---------------------------------------------
+
+The most obvious trick to workaround AppArmor's lack of support for
+union filesystems is to use [alias
+rules](http://wiki.apparmor.net/index.php/AppArmor_Core_Policy_Reference#Alias_and_rewrite_rules),
+such as:
+
+ echo 'alias / -> /lib/live/mount/rootfs/filesystem.squashfs/,' \
+ >> /etc/apparmor.d/tunables/alias
+
+However, a number of problems prevent this seemingly simple solution
+from just working in the context of Tails. The following discusses
+these complications, and a few possible solutions.
+
+### Bugs in alias rules implementation
+
+The implementation of alias rules is affected by severe bugs, such as
+<https://bugs.launchpad.net/apparmor/+bug/888077>.
+
+There's preliminary work to fix this at
+<https://code.launchpad.net/~jjohansen/+junk/parser-alias-fix>.
+Note that this code can still revert to the previous behaviour by
+passing the `-O old-alias` option to `apparmor_parser`.
+
+### Overlapping rules
+
+Alias rules can generate rules that overlap (and conflict) with
+existing ones, which can cause the policy to fail to compile.
+
+E.g. the `sanitized_helper` profile (sourced by the Evince
+profile and many others) contains this rule:
+
+ /lib{,32,64}/**/ld{,32,64}-*.so mrix,
+
+which, once combined with this alias:
+
+ alias / -> /lib/live/mount/rootfs/filesystem.squashfs/,
+
+will end up overlapping a lot of the rules generated for the alias.
+E.g.
+
+ /bin/* Pixr,
+
+results in a rule of:
+
+ /lib/live/mount/rootfs/filesystem.squashfs/bin/* Pixr,
+
+being generated, however since the alias command does not remove other
+rule sets, it only adds new rules. We end up with both:
+
+ /lib{,32,64}/**/ld{,32,64}-*.so mrix,
+ /lib/live/mount/rootfs/filesystem.squashfs/bin/* Pixr,
+
+which causes a conflict between `ix` and `Pix`.
+
+To workaround this problem, we would need to change the
+`/lib{,32,64}/**/ld{,32,64}-*.so mrix,` rule into:
+
+ /lib{32,64}/**/ld{,32,64}-*.so mrix,
+ /lib/{[^l],l[^i],li[^v],liv[^e],live[^/]}**/ld{,32,64}-*.so mrix,
+
+which allows the profile to compile, as the `x` conflict has
+been removed.
+
+Needless to say, this kind of regexp is painful to write, audit and
+maintain. Things could be nicer if AppArmor supported set operations;
+instead, we could do something like (syntax not finalized):
+
+ /lib/{^live**}/ld{,32,64}-*.so mrix,
+
+Other problematic overlaps include e.g. this rule from the
+`sanitized_helper` profile:
+
+ audit deny owner /**/* m,
+
+... that will take away the executable mmap permission from _all_
+applications under `/lib/live/` path, if the root user (who owns the
+file) tries to launch an application.
+
+This can possibly be fixed using [[rewrite
+rules|application_isolation#rewrite-rules]] instead of aliases, or by
+an update to the AppArmor permission merging logic that would give us
+a way to define that the alias rules should have priority in
+the union.
+
+Fixing such problems one after the other may be doable, but
+regardless: the way alias rules affect the policy as a whole,
+especially once combined with globing, would make our policy harder to
+understand, reason about, and audit.
+
+### Persistence
+
+It may be that more aliases are needed to support the bind-mounts set
+up by `live-boot` when using the [[contribute/design/persistence]]
+feature. It may even be that these aliases need to be dynamically
+added, in function of the persistence configuration... that is, at
+login time. If that was the case, then the entire policy would need to
+be recompiled at login time, which could make the user experience very
+painful, especially considering that alias rules vastly increase
+policy compilation time.
+
+### Increased policy compilation time
+
+Alias rules dramatically increase the policy compile time (e.g.
+100 seconds for the Evince profile, that can be brought down to
+8 seconds with the aforementioned rule change in the
+`sanitized_helper` profile).
+
+To mitigate that problem, we could:
+
+- either look at the rules and see if we can optimize it... which kind
+ of defeats the purpose of using alias rules in the first place to
+ avoid the need for modifying profiles;
+- or ship a cached pre-compiled policy. As long as the parser and
+ kernel are in sync, the policy can be pulled straight from the
+ cache, without any compilation. If the parser detects that the
+ policy is out of date, then the cache will be ignored and
+ compilation will happen. This is what is done for the Ubuntu phone.
+ Potential problems:
+ * if alias rules need to be added at login time, then the cache must
+ be invalidated, and the policy entirely recompiled;
+ * it remains to be researched how well this would work, once
+ combined with the [[additional software
+ packages|doc/first_steps/persistence/configure]] persistence
+ feature.
+
+<a id="rewrite-rules"></a>
+
+Using rewrite rules to avoid modifying profiles
+-----------------------------------------------
+
+Other than alias rules, another option to avoid modifying profiles
+would be to use [rewrite
+rules](http://wiki.apparmor.net/index.php/AppArmor_Core_Policy_Reference#Alias_and_rewrite_rules).
+They're basically the same as alias rules, except that it doesn't
+duplicate rules, so no conflicting rules are generated.
+
+It remains to be researched if rewrite rules would work in our use
+case: e.g. it might be that some files are seen as read from the
+SquashFS initially, and written to the overlay. If that would be the
+case, then we would need to duplicate some rules in profiles to add
+back some paths that were rewritten.
+
+overlayfs
+---------
+
+[overlayfs](https://git.kernel.org/cgit/linux/kernel/git/mszeredi/vfs.git/tree/Documentation/filesystems/overlayfs.txt?h=overlayfs.current)
+is another kind of union filesystem, that seems to have much greater
+chances than aufs to be merged into Linux mainline some day.
+overlayfs works differently from aufs, in ways that give hope that it
+might be easier for AppArmor to support it natively.
+
+Once it's merged in Linux mainline, Debian Live could be made to
+support overlayfs as an alternative to aufs. One thing that should be
+checked is whether overlayfs supports stacking up more than one
+read-only branch, which we do need for the Tails
+[[contribute/design/incremental upgrades]] feature.
+
+Some ongoing work on AppArmor (labeling, extended conditionals) will
+help support overlayfs. Time will tell whether the result meets
+our needs.
+
+<a id="linux-containers"></a>
+
+Linux containers
+----------------
+
+Using Linux containers for application isolation is being [[researched
+separately|blueprint/Linux_containers]].
+
+Credits
+=======
+
+We owe a lot of thanks to John Johansen (<john.johansen@canonical.com>)
+for his patience and support. Substantial parts of this document were
+adapted from explanations he provided to us.
diff --git a/wiki/src/contribute/design/persistence.mdwn b/wiki/src/contribute/design/persistence.mdwn
index d08588b..d3e521b 100644
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
@@ -23,8 +23,8 @@ This is relevant for the following applications:
- GnuPG, SSH and OTR key pairs
- GnuPG configuration
- SSH client configuration
-- iceweasel certificate trust
-- iceweasel bookmarks
+- Tor Browser certificate trust
+- Tor Browser bookmarks
- Pidgin configuration
- MUA configuration
- printers configuration
diff --git a/wiki/src/contribute/design/stream_isolation.mdwn b/wiki/src/contribute/design/stream_isolation.mdwn
index a8b8edd..5190e6a 100644
--- a/wiki/src/contribute/design/stream_isolation.mdwn
+++ b/wiki/src/contribute/design/stream_isolation.mdwn
@@ -26,8 +26,8 @@ Tails:
Web Browser
-----------
-Until Torbrowser implements clever fine-grained stream isolation
-([[!tor_bug 3455]]), Iceweasel is merely directed to a dedicated SOCKS port.
+Until the Tor Browser implements clever fine-grained stream isolation
+([[!tor_bug 3455]]) it is merely directed to a dedicated SOCKS port.
Destination address/port -based circuit isolation
-------------------------------------------------
@@ -46,7 +46,7 @@ However:
before we ship it to the masses.
For performance reasons, we will start with *not* using
-`IsolateDestAddr`/`IsolateDestPort` for iceweasel we ship: nowadays,
+`IsolateDestAddr`/`IsolateDestPort` for the Tor Browser: nowadays,
loading a mere web page often requires fetching resources from a dozen
or more remote sources. (Also, it looks like the use of
`IsolateDestAddr` in a modern web browser may create very uncommon
@@ -77,7 +77,7 @@ Implementation
==============
A few SOCKS ports are configured
-in [[!tails_gitweb chroot_local-includes/etc/tor/torrc]]:
+in [[!tails_gitweb config/chroot_local-includes/etc/tor/torrc]]:
* default system-wide `SocksPort` (9050): `IsolateDestAddr` and
`IsolateDestPort` enabled
@@ -85,15 +85,13 @@ in [[!tails_gitweb chroot_local-includes/etc/tor/torrc]]:
enabled
* dedicated `SocksPort` for Tails-specific applications (9062):
`IsolateDestAddr` and `IsolateDestPort` enabled
-* dedicated `SocksPort` for web browser (9151): no stream
+* dedicated `SocksPort` for web browser (9150): no stream
isolation options
* no specific isolation options for the `TransPort` ([[!tails_ticket 6378]])
Applications are configured to use the right SOCKS port:
-- [[!tails_gitweb config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js]]
-- [[!tails_gitweb config/chroot_local-includes/etc/iceweasel/profile/foxyproxy.xml]]
-- [[!tails_gitweb config/chroot_local-includes/etc/iceweasel/profile/user.js]]
+- [[!tails_gitweb config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js]]
- [[!tails_gitweb config/chroot_local-includes/etc/init.d/htpdate]]
- [[!tails_gitweb config/chroot_local-includes/etc/tor/tor-tsocks-mua.conf]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/tails-security-check]]
diff --git a/wiki/src/contribute/design/vagrant.mdwn b/wiki/src/contribute/design/vagrant.mdwn
index 62255b0..86a833b 100644
--- a/wiki/src/contribute/design/vagrant.mdwn
+++ b/wiki/src/contribute/design/vagrant.mdwn
@@ -46,67 +46,48 @@ called [Veewee].
Installing the requirements
---------------------------
-To build the *base box* from scratch using Veewee, you will need to get both
-Veewee and Vargant from Rubygems:
+Debian packages:
- # gem install --no-ri --no-rdoc vagrant
- # gem install --no-ri --no-rdoc veewee
+ sudo apt-get install ruby ruby-dev rubygems build-essential libxslt1-dev \
+ libxml2-dev virtualbox linux-headers-amd64
-*Note:* Unfortunately, using `gem --user` does not work. The `basebox`
-subcommands that is made available by Veewee never shows up in Vagrant.
-That needs to sorted out upstream.
+Veewee isn't packaged in Debian, so we install the Ruby Gem as the
+user that is gonna build the basebox:
-*Note:* Installing the Veewee gem will install the Vagrant gem, even
-if the Debian package is installed.
-
-Running Veewee
---------------
-
-Running Veewee has been automated using Rake. So creating the *base box* is
-just a matter of running:
-
- $ http_proxy="http://proxy.lan:3142" rake basebox:create_basebox
-
-Obivously, you can drop the `http_proxy` part if you don't have one.
-
-The rest should be fully automatic, and leave you with a `squeeze.box` file in
-the `vagrant` directory.
+ gem install --user --no-ri --no-rdoc veewee
Update the distributed *base box*
---------------------------------
-The *base box* on Tails mirrors is expected to lie at
-`project/vagrant/squeeze.box`.
-
-Do not forget to update the corresponding SHA256 sum in `vagrant/Vagrantfile`.
-
-In details
-----------
-
-To create the *basebox* from the `squeeze` template (in `definitions`
-directory), the command is the following:
-
- $ vagrant basebox build squeeze
-
-> *Note:* It looks like the current version of the `virtualbox` gem is not
-> compatible with VirtualBox 4.0.x that is in `squeeze-backports`. Using
-> a hand made backport of virtualbox 4.1.12-dfsg-2 worked fine.
-
-After issuing that command, Veewee will download the boot ISO image,
-drive the debian-installer using [preeseding] and run `postinstall.sh` that
-will take care of seting up the environment expected by Vagrant.
-
-[preseeding]: https://www.debian.org/releases/stable/i386/apbs02.html
-
-In order to support local HTTP proxy, the `preseed.cfg` is generated from an
-ERB template during the Rake task `create_preseed_cfg`.
-
-Once the initial setup is done, it is worthwhile to see if the *basebox*
-fits Vagrant requirements. Veewee ships with an automated test suite:
-
- $ vagrant basebox validate squeeze
-
-If everything goes well, then, great, we have our *basebox*. Let's export
-it to a `.box` file that Vagrant can use:
-
- $ vagrant basebox export squeeze
+After issuing the commands below, Veewee will download the boot ISO
+image, drive the debian-installer using
+[preeseding](https://www.debian.org/releases/stable/i386/apbs02.html)
+and run `postinstall.sh` to take care of seting up the environment
+expected by Vagrant.
+
+ ORIG_BOXNAME=tails-builder
+ DATE="$(date +%Y%m%d)"
+ BOXNAME="${ORIG_BOXNAME}-${DATE}"
+ sed -i "s/tails-builder-[0-9]\{8\}/${BOXNAME}/" vagrant/Vagrantfile
+ mkdir -p "${VEEWEE_SRC}"/definitions
+ cp -a vagrant/definitions/${ORIG_BOXNAME}" vagrant/definitions/${BOXNAME}"
+ veewee vbox build "${BOXNAME}"
+ vboxmanage controlvm "${BOXNAME}" acpipowerbutton
+
+Wait until VM shuts down, then:
+
+ veewee vbox export "${BOXNAME}"
+ vboxmanage unregistervm "${BOXNAME}" --delete
+ rm -rf definitions/"${BOXNAME}"
+ CHECKSUM="$(sha256sum ${BOXNAME}.box | grep -o '^\w\+')"
+ sed -i -e "s/^BOX_CHECKSUM = .*$/BOX_CHECKSUM = '${CHECKSUM}'/" \
+ vagrant/lib/tails_build_settings.rb
+ sed -i "s/tails-builder-[0-9]\{8\}/${BOXNAME}/" \
+ vagrant/lib/tails_build_settings.rb vagrant/Vagrantfile
+ git commit vagrant -m "Updated Vagrant basebox."
+
+Then `$BOXNAME.box` will be placed in tails source root,
+and all needed changes committed to the current checked out branch in
+Tails sources. The basebox should be uploaded to the Tails mirrors at
+`http://dl.amnesia.boum.org/tails/project/vagrant/$BOXNAME.box`, as
+define defined in `vagrant/Vagrantfile`.
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index c796228..c3f680f 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -23,9 +23,13 @@ href="http://git-scm.com/documentation">official documentation</a>.</p>
Here are a couple of links to get started with Git:
+- An [interactive introduction](https://try.github.io/) to Git
+- [Git basics](https://www.atlassian.com/git/tutorial/git-basics), by Atlassian
+- [Git immersion](http://gitimmersion.com/), a step-by-step introduction
- Pro Git: [online](http://git-scm.com/book),
[PDF](https://github.s3.amazonaws.com/media/progit.en.pdf), a book on Git from
- basic to advanced usage.
+ basic to advanced usage. This book is available in several languages. Among others:
+ [German](http://git-scm.com/book/de), [French](http://git-scm.com/book/fr), [Português](http://git-scm.com/book/pt-br) (Brasil)
- [OpenHatch Missions: Using Git](https://openhatch.org/missions/git), concrete
exercises to train yourself in using Git.
- [Git For Ages 4 And
diff --git a/wiki/src/contribute/how/documentation/guidelines.mdwn b/wiki/src/contribute/how/documentation/guidelines.mdwn
index 8a76014..77a563e 100644
--- a/wiki/src/contribute/how/documentation/guidelines.mdwn
+++ b/wiki/src/contribute/how/documentation/guidelines.mdwn
@@ -15,29 +15,29 @@ authors who want to contribute to the GNOME Documentation Project (GDP).
Try to follow those guidelines when writing documentation and GUI for
Tails.
- - [GNOME Documentation Style Guide](http://developer.gnome.org/gdp-style-guide/stable/),
+ - [GNOME Documentation Style Guide](http://developer.gnome.org/gdp-style-guide/2.32/),
- [GNOME Documentation Style Guide, single HTML
- file](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html)
+ file](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html)
**Read at least [Section 1 ― Fundamental Concepts of Technical
-Documentation](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#fundamentals).**
+Documentation](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#fundamentals).**
The following sections are also of particular interest or have been
debated within Tails before:
- [2.4.2.&nbsp;Guidelines for Using Screenshots in Online
- Help](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#infodesign-10)
+ Help](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#infodesign-10)
explains how to decide to use screenshots.
- [4.&nbsp;Writing documentation for an International
- Audience](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#locale)
+ Audience](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#locale)
includes specific rules about how to write documentation that is
easier to translate, with practical examples.
- [5.2.&nbsp;Checks You Can Do
- Yourself](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#improving-6)
+ Yourself](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#improving-6)
lists the top ten topics that you need to watch out for when you
review your work.
- [A.&nbsp;Recommended
- Terminology](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#wordlist)
+ Terminology](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#wordlist)
contains a glossary of terms for use when writing documentation.
Use title capitalization rules from Wikipedia
@@ -53,14 +53,13 @@ audience to read.
But use title capitalization, as described in GDSG section
[3.&nbsp;Grammar and Usage
-Guidelines](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#grammar)
+Guidelines](http://developer.gnome.org/gdp-style-guide/2.32/gdp-style-guide.html#grammar)
for the names of GUI items: buttons, dialogs, applications, menus, etc.
CSS formating for GUI documentation
===================================
-Use the equivalent of [DocBook
-tags](http://developer.gnome.org/gdp-handbook/stable/docbook.html.en#docbook-inline)
+Use the equivalent of DocBook tags
to style your documentation using CSS.
- <span class="code">span.application</span> for application names, for example:
@@ -107,7 +106,7 @@ Tips, notes, cautions, bugs, and next
Use tips, notes, and cautions to highlight important information, as
described in the GNOME Documentation Style Guide.
-<https://developer.gnome.org/gdp-style-guide/stable/infodesign-18.html.en>
+<https://developer.gnome.org/gdp-style-guide/2.32/infodesign-18.html.en>
Bugs
----
@@ -119,7 +118,7 @@ is described in its principal use cases. For example:
The screen reading functionality of <span class="application">GNOME
Orca</span> does not work neither with the <span
-class="application">Iceweasel Web Browser</span> nor with the <span
+class="application">Tor Browser</span> nor with the <span
class="application">Unsafe Web Browser</span>.
</div>
diff --git a/wiki/src/contribute/how/donate.de.po b/wiki/src/contribute/how/donate.de.po
new file mode 100644
index 0000000..a5e6d1a
--- /dev/null
+++ b/wiki/src/contribute/how/donate.de.po
@@ -0,0 +1,267 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-09-22 12:27+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Make a donation\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Your support is critical to our success.** Consider making\n"
+"a donation to Tails.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note that Tails is a project mainly run by volunteers. There are [[many "
+"other ways to contribute|contribute]]!"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Ways to donate\n"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"Crowdfunding campaign run by the American organization [Freedom of the Press "
+"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
+"journalists)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " If you live in the US, your donation will be tax-deductible.\n"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
+"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you live in Europe, your donation might be tax-deductible. Check what are\n"
+" the precise conditions in your country, and [ask\n"
+" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
+" receipt if you need one.\n"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "[[Bitcoin|donate#bitcoin]]"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"If none of these methods suit you, consider [donating to the Tor Project]"
+"(https://www.torproject.org/donate/). They do great work, and also support "
+"us financially."
+msgstr ""
+
+#. type: Plain text
+msgid "Thank you for your donation!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"bitcoin\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Bitcoin\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
+"anonymous</a>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"swift\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Bank wire transfer\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Account holder: Zwiebelfreunde e.V.\n"
+" Name of bank: GLS Gemeinschaftsbank eG\n"
+" IBAN: DE25430609671126825603\n"
+" BIC: GENODEM1GLS\n"
+" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"paypal\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Paypal\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please, use the euro (EUR) as currency as this makes accounting easier. "
+"However, Paypal automatically converts it to your local currency."
+msgstr ""
+
+#. type: Title ###
+#, no-wrap
+msgid "Set up a recurring donation"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
+"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
+"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
+"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
+"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t\t<option value='EUR'>EUR</option>\n"
+"\t\t\t<option value='USD'>USD</option>\n"
+"\t\t\t<option value='GBP'>GBP</option>\n"
+"\t\t\t<option value='CAD'>CAD</option>\n"
+"\t\t\t<option value='AUD'>AUD</option>\n"
+"\t\t\t<option value='NZD'>NZD</option>\n"
+"\t\t\t<option value='SEK'>SEK</option>\n"
+"\t\t\t<option value='CZK'>CZK</option>\n"
+"\t\t\t<option value='PLN'>PLN</option>\n"
+"\t\t\t<option value='DKK'>DKK</option>\n"
+"\t\t\t<option value='NOK'>NOK</option>\n"
+"\t\t\t<option value='MXN'>MXN</option>\n"
+"\t\t\t<option value='CHF'>CHF</option>\n"
+"\t\t\t<option value='HKD'>HKD</option>\n"
+"\t\t\t<option value='HUF'>HUF</option>\n"
+"\t\t\t<option value='ILS'>ILS</option>\n"
+"\t\t\t<option value='BRL'>BRL</option>\n"
+"\t\t\t<option value='JPY'>JPY</option>\n"
+"\t\t\t<option value='MYR'>MYR</option>\n"
+"\t\t\t<option value='PHP'>PHP</option>\n"
+"\t\t\t<option value='SGD'>SGD</option>\n"
+"\t\t\t<option value='TWD'>TWD</option>\n"
+"\t\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+
+#. type: Title ###
+#, no-wrap
+msgid "Make a one-time donation"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
+"\t<input name='cmd' type='hidden' value='_donations' />\n"
+"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
+"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
+"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t<option value='EUR'>EUR</option>\n"
+"\t\t<option value='USD'>USD</option>\n"
+"\t\t<option value='GBP'>GBP</option>\n"
+"\t\t<option value='CAD'>CAD</option>\n"
+"\t\t<option value='AUD'>AUD</option>\n"
+"\t\t<option value='NZD'>NZD</option>\n"
+"\t\t<option value='SEK'>SEK</option>\n"
+"\t\t<option value='CZK'>CZK</option>\n"
+"\t\t<option value='PLN'>PLN</option>\n"
+"\t\t<option value='DKK'>DKK</option>\n"
+"\t\t<option value='NOK'>NOK</option>\n"
+"\t\t<option value='MXN'>MXN</option>\n"
+"\t\t<option value='CHF'>CHF</option>\n"
+"\t\t<option value='HKD'>HKD</option>\n"
+"\t\t<option value='HUF'>HUF</option>\n"
+"\t\t<option value='ILS'>ILS</option>\n"
+"\t\t<option value='BRL'>BRL</option>\n"
+"\t\t<option value='JPY'>JPY</option>\n"
+"\t\t<option value='MYR'>MYR</option>\n"
+"\t\t<option value='PHP'>PHP</option>\n"
+"\t\t<option value='SGD'>SGD</option>\n"
+"\t\t<option value='TWD'>TWD</option>\n"
+"\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "How does Tails use this money?\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Our [[financial documents|doc/about/finances]] are available for your review."
+msgstr ""
diff --git a/wiki/src/contribute/how/donate.fr.po b/wiki/src/contribute/how/donate.fr.po
new file mode 100644
index 0000000..cf0bb24
--- /dev/null
+++ b/wiki/src/contribute/how/donate.fr.po
@@ -0,0 +1,381 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-09-22 12:27+0300\n"
+"PO-Revision-Date: 2014-08-14 10:59+0200\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Make a donation\"]]\n"
+msgstr "[[!meta title=\"Faire un don\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Your support is critical to our success.** Consider making\n"
+"a donation to Tails.\n"
+msgstr ""
+"**Votre soutien est essentiel.** Envisagez de faire\n"
+"un don à Tails.\n"
+
+#. type: Plain text
+msgid ""
+"Note that Tails is a project mainly run by volunteers. There are [[many "
+"other ways to contribute|contribute]]!"
+msgstr ""
+"Notez que le projet Tails est principalement maintenu par des bénévoles.\n"
+"Il y a [[de nombreuses autres façons de contribuer|contribute]] !"
+
+#. type: Title =
+#, no-wrap
+msgid "Ways to donate\n"
+msgstr "Comment faire un don\n"
+
+#. type: Bullet: ' * '
+msgid ""
+"Crowdfunding campaign run by the American organization [Freedom of the Press "
+"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
+"journalists)."
+msgstr ""
+"Contribuer à la campagne de financement organisée par l'association états-"
+"unienne [Freedom of the Press Foundation](https://pressfreedomfoundation.org/"
+"bundle/encryption-tools-journalists)."
+
+#. type: Plain text
+#, no-wrap
+msgid " If you live in the US, your donation will be tax-deductible.\n"
+msgstr " Si vous habitez aux États-Unis, votre don sera déductible d'impôts.\n"
+
+#. type: Bullet: ' * '
+msgid ""
+"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
+"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
+msgstr ""
+"[[Virement bancaire|donate#swift]] ou [[Paypal|donate#paypal]] via "
+"l'association allemande [Zwiebelfreunde e.V.](https://www.zwiebelfreunde."
+"de/)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you live in Europe, your donation might be tax-deductible. Check what are\n"
+" the precise conditions in your country, and [ask\n"
+" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
+" receipt if you need one.\n"
+msgstr ""
+" Si vous habitez en Europe, votre don peut être déductible d'impôts. Vérifiez les\n"
+" conditions en vigueur dans votre pays et, au besoin, [demandez un reçu à\n"
+" Zwiebelfreunde](https://www.torservers.net/contact.html).\n"
+
+#. type: Bullet: ' * '
+msgid "[[Bitcoin|donate#bitcoin]]"
+msgstr "[[Bitcoin|donate#bitcoin]]"
+
+#. type: Bullet: ' * '
+msgid ""
+"If none of these methods suit you, consider [donating to the Tor Project]"
+"(https://www.torproject.org/donate/). They do great work, and also support "
+"us financially."
+msgstr ""
+"Si aucun de ces moyens ne vous convient, vous pouvez [faire un don au projet "
+"Tor](https://www.torproject.org/donate/). Ils font un travail formidable et "
+"nous soutiennent financièrement."
+
+#. type: Plain text
+msgid "Thank you for your donation!"
+msgstr "Merci pour votre don !"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"bitcoin\"></a>\n"
+msgstr "<a id=\"bitcoin\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Bitcoin\n"
+msgstr "Bitcoin\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+msgstr "Vous pouvez envoyer des Bitcoins à l'adresse **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr "<div class=\"caution\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
+"anonymous</a>.</p>\n"
+msgstr ""
+"<p>Bitcoin n'est <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">pas\n"
+"anonyme</a>.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"swift\"></a>\n"
+msgstr "<a id=\"swift\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Bank wire transfer\n"
+msgstr "Virement bancaire\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Account holder: Zwiebelfreunde e.V.\n"
+" Name of bank: GLS Gemeinschaftsbank eG\n"
+" IBAN: DE25430609671126825603\n"
+" BIC: GENODEM1GLS\n"
+" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
+msgstr ""
+" Titulaire du compte : Zwiebelfreunde e.V.\n"
+" Nom de la banque : GLS Gemeinschaftsbank eG\n"
+" IBAN : DE25430609671126825603\n"
+" BIC : GENODEM1GLS\n"
+" Adresse de la banque : Christstrasse 9, 44789 Bochum, Allemagne\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"paypal\"></a>\n"
+msgstr "<a id=\"paypal\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Paypal\n"
+msgstr "Paypal\n"
+
+#. type: Plain text
+msgid ""
+"Please, use the euro (EUR) as currency as this makes accounting easier. "
+"However, Paypal automatically converts it to your local currency."
+msgstr ""
+"Merci d'utiliser l'euro (EUR) pour faciliter notre comptabilité. Paypal "
+"convertira automatiquement le don dans votre devise."
+
+#. type: Title ###
+#, no-wrap
+msgid "Set up a recurring donation"
+msgstr "Faire un don régulier"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
+"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
+"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
+"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
+"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t\t<option value='EUR'>EUR</option>\n"
+"\t\t\t<option value='USD'>USD</option>\n"
+"\t\t\t<option value='GBP'>GBP</option>\n"
+"\t\t\t<option value='CAD'>CAD</option>\n"
+"\t\t\t<option value='AUD'>AUD</option>\n"
+"\t\t\t<option value='NZD'>NZD</option>\n"
+"\t\t\t<option value='SEK'>SEK</option>\n"
+"\t\t\t<option value='CZK'>CZK</option>\n"
+"\t\t\t<option value='PLN'>PLN</option>\n"
+"\t\t\t<option value='DKK'>DKK</option>\n"
+"\t\t\t<option value='NOK'>NOK</option>\n"
+"\t\t\t<option value='MXN'>MXN</option>\n"
+"\t\t\t<option value='CHF'>CHF</option>\n"
+"\t\t\t<option value='HKD'>HKD</option>\n"
+"\t\t\t<option value='HUF'>HUF</option>\n"
+"\t\t\t<option value='ILS'>ILS</option>\n"
+"\t\t\t<option value='BRL'>BRL</option>\n"
+"\t\t\t<option value='JPY'>JPY</option>\n"
+"\t\t\t<option value='MYR'>MYR</option>\n"
+"\t\t\t<option value='PHP'>PHP</option>\n"
+"\t\t\t<option value='SGD'>SGD</option>\n"
+"\t\t\t<option value='TWD'>TWD</option>\n"
+"\t\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
+"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
+"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
+"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
+"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t\t<option value='EUR'>EUR</option>\n"
+"\t\t\t<option value='USD'>USD</option>\n"
+"\t\t\t<option value='GBP'>GBP</option>\n"
+"\t\t\t<option value='CAD'>CAD</option>\n"
+"\t\t\t<option value='AUD'>AUD</option>\n"
+"\t\t\t<option value='NZD'>NZD</option>\n"
+"\t\t\t<option value='SEK'>SEK</option>\n"
+"\t\t\t<option value='CZK'>CZK</option>\n"
+"\t\t\t<option value='PLN'>PLN</option>\n"
+"\t\t\t<option value='DKK'>DKK</option>\n"
+"\t\t\t<option value='NOK'>NOK</option>\n"
+"\t\t\t<option value='MXN'>MXN</option>\n"
+"\t\t\t<option value='CHF'>CHF</option>\n"
+"\t\t\t<option value='HKD'>HKD</option>\n"
+"\t\t\t<option value='HUF'>HUF</option>\n"
+"\t\t\t<option value='ILS'>ILS</option>\n"
+"\t\t\t<option value='BRL'>BRL</option>\n"
+"\t\t\t<option value='JPY'>JPY</option>\n"
+"\t\t\t<option value='MYR'>MYR</option>\n"
+"\t\t\t<option value='PHP'>PHP</option>\n"
+"\t\t\t<option value='SGD'>SGD</option>\n"
+"\t\t\t<option value='TWD'>TWD</option>\n"
+"\t\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">mensuel</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">trimestriel</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">annuel</label>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"S'inscrire\" class=\"button\" />\n"
+"</form>\n"
+
+#. type: Title ###
+#, no-wrap
+msgid "Make a one-time donation"
+msgstr "Faire un don ponctuel"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
+"\t<input name='cmd' type='hidden' value='_donations' />\n"
+"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
+"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
+"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t<option value='EUR'>EUR</option>\n"
+"\t\t<option value='USD'>USD</option>\n"
+"\t\t<option value='GBP'>GBP</option>\n"
+"\t\t<option value='CAD'>CAD</option>\n"
+"\t\t<option value='AUD'>AUD</option>\n"
+"\t\t<option value='NZD'>NZD</option>\n"
+"\t\t<option value='SEK'>SEK</option>\n"
+"\t\t<option value='CZK'>CZK</option>\n"
+"\t\t<option value='PLN'>PLN</option>\n"
+"\t\t<option value='DKK'>DKK</option>\n"
+"\t\t<option value='NOK'>NOK</option>\n"
+"\t\t<option value='MXN'>MXN</option>\n"
+"\t\t<option value='CHF'>CHF</option>\n"
+"\t\t<option value='HKD'>HKD</option>\n"
+"\t\t<option value='HUF'>HUF</option>\n"
+"\t\t<option value='ILS'>ILS</option>\n"
+"\t\t<option value='BRL'>BRL</option>\n"
+"\t\t<option value='JPY'>JPY</option>\n"
+"\t\t<option value='MYR'>MYR</option>\n"
+"\t\t<option value='PHP'>PHP</option>\n"
+"\t\t<option value='SGD'>SGD</option>\n"
+"\t\t<option value='TWD'>TWD</option>\n"
+"\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
+"\t<input name='cmd' type='hidden' value='_donations' />\n"
+"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
+"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
+"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">autre montant</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t<option value='EUR'>EUR</option>\n"
+"\t\t<option value='USD'>USD</option>\n"
+"\t\t<option value='GBP'>GBP</option>\n"
+"\t\t<option value='CAD'>CAD</option>\n"
+"\t\t<option value='AUD'>AUD</option>\n"
+"\t\t<option value='NZD'>NZD</option>\n"
+"\t\t<option value='SEK'>SEK</option>\n"
+"\t\t<option value='CZK'>CZK</option>\n"
+"\t\t<option value='PLN'>PLN</option>\n"
+"\t\t<option value='DKK'>DKK</option>\n"
+"\t\t<option value='NOK'>NOK</option>\n"
+"\t\t<option value='MXN'>MXN</option>\n"
+"\t\t<option value='CHF'>CHF</option>\n"
+"\t\t<option value='HKD'>HKD</option>\n"
+"\t\t<option value='HUF'>HUF</option>\n"
+"\t\t<option value='ILS'>ILS</option>\n"
+"\t\t<option value='BRL'>BRL</option>\n"
+"\t\t<option value='JPY'>JPY</option>\n"
+"\t\t<option value='MYR'>MYR</option>\n"
+"\t\t<option value='PHP'>PHP</option>\n"
+"\t\t<option value='SGD'>SGD</option>\n"
+"\t\t<option value='TWD'>TWD</option>\n"
+"\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Donner\" class=\"button\" />\n"
+"</form>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "How does Tails use this money?\n"
+msgstr "Comment Tails utilise cet argent ?\n"
+
+#. type: Plain text
+msgid ""
+"Our [[financial documents|doc/about/finances]] are available for your review."
+msgstr "Vous pouvez consulter nos [[rapports financiers|doc/about/finances]]."
diff --git a/wiki/src/contribute/how/donate.mdwn b/wiki/src/contribute/how/donate.mdwn
index d95d31f..f853de7 100644
--- a/wiki/src/contribute/how/donate.mdwn
+++ b/wiki/src/contribute/how/donate.mdwn
@@ -3,38 +3,161 @@
**Your support is critical to our success.** Consider making
a donation to Tails.
-(Note that Tails is a project mainly run by volunteers. There are
-[[many other ways to contribute|contribute]]!)
+Note that Tails is a project mainly run by volunteers. There are
+[[many other ways to contribute|contribute]]!
-[[!toc levels=2]]
+Ways to donate
+==============
-# Ways to donate
+ * Crowdfunding campaign run by the American organization [Freedom of the Press Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-journalists).
-We currently accept donations via:
+ If you live in the US, your donation will be tax-deductible.
+
+ * [[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the
+ German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/).
+
+ If you live in Europe, your donation might be tax-deductible. Check what are
+ the precise conditions in your country, and [ask
+ Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation
+ receipt if you need one.
- * A crowdfunding campaign run by the [Freedom of the Press Foundation](https://pressfreedomfoundation.org/)
* [[Bitcoin|donate#bitcoin]]
- * In the future, we might be able to accept other kinds of
- donations: Paypal, wire or bank transfer... In the meantime, if
- you cannot donate through Bitcoin, please [direct your donations
- to the Tor Project](https://www.torproject.org/donate/) -- they do
- great work, and they support us financially.
+
+ * If none of these methods suit you, consider [donating
+ to the Tor Project](https://www.torproject.org/donate/). They do
+ great work, and also support us financially.
+
+Thank you for your donation!
<a id="bitcoin"></a>
-## Bitcoin
+Bitcoin
+-------
+
+You can send Bitcoins to **<a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.
+
+<div class="caution">
+
+<p>Bitcoin is <a href="https://bitcoin.org/en/faq#is-bitcoin-anonymous">not
+anonymous</a>.</p>
+
+</div>
+
+<a id="swift"></a>
+
+Bank wire transfer
+------------------
+
+ Account holder: Zwiebelfreunde e.V.
+ Name of bank: GLS Gemeinschaftsbank eG
+ IBAN: DE25430609671126825603
+ BIC: GENODEM1GLS
+ Address of bank: Christstrasse 9, 44789 Bochum, Germany
+
+<a id="paypal"></a>
+
+Paypal
+------
+
+Please, use the euro (EUR) as currency as this makes accounting easier. However, Paypal
+automatically converts it to your local currency.
-Send us Bitcoins to: **1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2**
+### Set up a recurring donation
-Beware: Bitcoin does not provide strong anonymity.
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target='_blank' class='donation'>
+ <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
+ <input type="hidden" name="business" value="donate@torservers.net"/>
+ <input type="hidden" name="item_name" value="Tails recurring donation"/>
+ <input type="hidden" name="no_note" value="1"/>
+ <input type="hidden" name="src" value="1"/>
+ <input type="hidden" name="modify" value="1"/>
+ <input type="hidden" name="t3" value="M"/>
+ <input name="lc" type="hidden" value="US" />
+ <input type="radio" name="a3" value="5" id="sub5" checked="checked" /><label for="sub5">5</label>
+ <input type="radio" name="a3" value="10" id="sub10"/><label for="sub10">10</label>
+ <input type="radio" name="a3" value="20" id="sub20"/><label for="sub20">20</label>
+ <input type="radio" name="a3" value="50" id="sub50"/><label for="sub50">50</label>
+ <input type="radio" name="a3" value="100" id="sub100"/><label for="sub100">100</label>
+ <input type="radio" name="a3" value="250" id="sub250"/><label for="sub250">250</label>
+ <input type="radio" name="a3" value="500" id="sub500"/><label for="sub500">500</label>
+ <select name="currency_code">
+ <option value='EUR'>EUR</option>
+ <option value='USD'>USD</option>
+ <option value='GBP'>GBP</option>
+ <option value='CAD'>CAD</option>
+ <option value='AUD'>AUD</option>
+ <option value='NZD'>NZD</option>
+ <option value='SEK'>SEK</option>
+ <option value='CZK'>CZK</option>
+ <option value='PLN'>PLN</option>
+ <option value='DKK'>DKK</option>
+ <option value='NOK'>NOK</option>
+ <option value='MXN'>MXN</option>
+ <option value='CHF'>CHF</option>
+ <option value='HKD'>HKD</option>
+ <option value='HUF'>HUF</option>
+ <option value='ILS'>ILS</option>
+ <option value='BRL'>BRL</option>
+ <option value='JPY'>JPY</option>
+ <option value='MYR'>MYR</option>
+ <option value='PHP'>PHP</option>
+ <option value='SGD'>SGD</option>
+ <option value='TWD'>TWD</option>
+ <option value='THB'>THB</option>
+ </select>
+ <br/>
+ <input type="radio" name="p3" value="1" id="sub_m" checked="checked" /><label for="sub_m">monthly</label>
+ <input type="radio" name="p3" value="3" id="sub_q"/><label for="sub_q">quarterly</label>
+ <input type="radio" name="p3" value="12" id="sub_y"/><label for="sub_y">yearly</label>
+ <br/>
+ <input type="submit" value="Subscribe" class="button" />
+</form>
-# What happens to my donation?
+### Make a one-time donation
-If you've just donated, thank you for your donation. Your funds are
-deposited into our general fund.
+<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>
+ <input name='cmd' type='hidden' value='_donations' />
+ <input name='business' type='hidden' value='donate@torservers.net' />
+ <input name='item_name' type='hidden' value='Tails one-time donation' />
+ <input type="hidden" name="no_shipping" value="1"/>
+ <input name="lc" type="hidden" value="US" />
+ <input type="radio" name="amount" value="5" id="pp_5" /><label for="pp_5">5</label>
+ <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">10</label>
+ <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">20</label>
+ <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">50</label>
+ <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">100</label>
+ <input type="radio" name="amount" value="" id="pp_cust" checked="checked"/><label for="pp_cust">custom amount</label>
+ <select name="currency_code">
+ <option value='EUR'>EUR</option>
+ <option value='USD'>USD</option>
+ <option value='GBP'>GBP</option>
+ <option value='CAD'>CAD</option>
+ <option value='AUD'>AUD</option>
+ <option value='NZD'>NZD</option>
+ <option value='SEK'>SEK</option>
+ <option value='CZK'>CZK</option>
+ <option value='PLN'>PLN</option>
+ <option value='DKK'>DKK</option>
+ <option value='NOK'>NOK</option>
+ <option value='MXN'>MXN</option>
+ <option value='CHF'>CHF</option>
+ <option value='HKD'>HKD</option>
+ <option value='HUF'>HUF</option>
+ <option value='ILS'>ILS</option>
+ <option value='BRL'>BRL</option>
+ <option value='JPY'>JPY</option>
+ <option value='MYR'>MYR</option>
+ <option value='PHP'>PHP</option>
+ <option value='SGD'>SGD</option>
+ <option value='TWD'>TWD</option>
+ <option value='THB'>THB</option>
+ </select>
+ <br/>
+ <input type="submit" value="Donate" class="button" />
+</form>
-<!-- You joined many other individual -->
-<!-- sponsors in funding the future of Tails and online anonymity. -->
+How does Tails use this money?
+==============================
Our [[financial documents|doc/about/finances]] are available for
your review.
diff --git a/wiki/src/contribute/how/donate.pt.po b/wiki/src/contribute/how/donate.pt.po
new file mode 100644
index 0000000..642411b
--- /dev/null
+++ b/wiki/src/contribute/how/donate.pt.po
@@ -0,0 +1,383 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-09-22 12:27+0300\n"
+"PO-Revision-Date: 2014-09-15 12:30-0300\n"
+"Last-Translator: Tails Developers <amnesia@boum.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Make a donation\"]]\n"
+msgstr "[[!meta title=\"Faça uma doação\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Your support is critical to our success.** Consider making\n"
+"a donation to Tails.\n"
+msgstr ""
+"**Seu apoio é crítico para nosso sucesso.** Considere fazer\n"
+"uma doação para o Tails.\n"
+
+#. type: Plain text
+msgid ""
+"Note that Tails is a project mainly run by volunteers. There are [[many "
+"other ways to contribute|contribute]]!"
+msgstr ""
+"Note que Tails é um projeto executado principalmente por voluntários/as. "
+"Existem [[muitas outras formas de contribuir|contribute]]!"
+
+#. type: Title =
+#, no-wrap
+msgid "Ways to donate\n"
+msgstr "Formas de doação\n"
+
+#. type: Bullet: ' * '
+msgid ""
+"Crowdfunding campaign run by the American organization [Freedom of the Press "
+"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
+"journalists)."
+msgstr ""
+"Campanha de financiamento coletivo coordenada pela organização americana "
+"[Freedom of the Press Foundation](https://pressfreedomfoundation.org/bundle/"
+"encryption-tools-journalists)."
+
+#. type: Plain text
+#, no-wrap
+msgid " If you live in the US, your donation will be tax-deductible.\n"
+msgstr " Se você vive nos Estados Unidos da América, sua doação será dedutível de impostos.\n"
+
+#. type: Bullet: ' * '
+msgid ""
+"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
+"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
+msgstr ""
+"[[Transferência bancária|donate#swift]] ou [[Paypal|donate#paypal]] através "
+"da organização alemã [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you live in Europe, your donation might be tax-deductible. Check what are\n"
+" the precise conditions in your country, and [ask\n"
+" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
+" receipt if you need one.\n"
+msgstr ""
+" Se você vive na Europa, é possível que sua doação seja dedutível de impostos. Verifique\n"
+" quais são exatamente as condições no seu país, e [peça à\n"
+" Zwiebelfreunde](https://www.torservers.net/contact.html) um recibo\n"
+" caso você precise de um.\n"
+
+#. type: Bullet: ' * '
+msgid "[[Bitcoin|donate#bitcoin]]"
+msgstr "[[Bitcoin|donate#bitcoin]]"
+
+#. type: Bullet: ' * '
+msgid ""
+"If none of these methods suit you, consider [donating to the Tor Project]"
+"(https://www.torproject.org/donate/). They do great work, and also support "
+"us financially."
+msgstr ""
+"Se nenhum destes métodos são bons pra você, considere [fazer uma doação para "
+"o Projeto Tor](https://www.torproject.org/donate/). Eles fazem um ótimo "
+"trabalho, e também nos apoiam financeiramente."
+
+#. type: Plain text
+msgid "Thank you for your donation!"
+msgstr "Obrigado por sua doação!"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"bitcoin\"></a>\n"
+msgstr "<a id=\"bitcoin\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Bitcoin\n"
+msgstr "Bitcoin\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+msgstr "Você pode enviar Bitcoins para **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr "<div class=\"caution\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
+"anonymous</a>.</p>\n"
+msgstr ""
+"<p>Bitcoin <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">não\n"
+"é anônimo</a>.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"swift\"></a>\n"
+msgstr "<a id=\"swift\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Bank wire transfer\n"
+msgstr "Transferência bancária\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Account holder: Zwiebelfreunde e.V.\n"
+" Name of bank: GLS Gemeinschaftsbank eG\n"
+" IBAN: DE25430609671126825603\n"
+" BIC: GENODEM1GLS\n"
+" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
+msgstr ""
+" Titular da conta: Zwiebelfreunde e.V.\n"
+" Nome do banco: GLS Gemeinschaftsbank eG\n"
+" IBAN: DE25430609671126825603\n"
+" BIC: GENODEM1GLS\n"
+" Endereço do banco: Christstrasse 9, 44789 Bochum, Alemanha\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"paypal\"></a>\n"
+msgstr "<a id=\"paypal\"></a>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Paypal\n"
+msgstr "Paypal\n"
+
+#. type: Plain text
+msgid ""
+"Please, use the euro (EUR) as currency as this makes accounting easier. "
+"However, Paypal automatically converts it to your local currency."
+msgstr ""
+"Por favor, use euros (EUR) como moeda pois isto facilita nossa "
+"contabilidade. De qualquer forma, o Paypal converte automaticamente para sua "
+"moeda local."
+
+#. type: Title ###
+#, no-wrap
+msgid "Set up a recurring donation"
+msgstr "Configure uma doação periódica"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
+"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
+"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
+"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
+"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t\t<option value='EUR'>EUR</option>\n"
+"\t\t\t<option value='USD'>USD</option>\n"
+"\t\t\t<option value='GBP'>GBP</option>\n"
+"\t\t\t<option value='CAD'>CAD</option>\n"
+"\t\t\t<option value='AUD'>AUD</option>\n"
+"\t\t\t<option value='NZD'>NZD</option>\n"
+"\t\t\t<option value='SEK'>SEK</option>\n"
+"\t\t\t<option value='CZK'>CZK</option>\n"
+"\t\t\t<option value='PLN'>PLN</option>\n"
+"\t\t\t<option value='DKK'>DKK</option>\n"
+"\t\t\t<option value='NOK'>NOK</option>\n"
+"\t\t\t<option value='MXN'>MXN</option>\n"
+"\t\t\t<option value='CHF'>CHF</option>\n"
+"\t\t\t<option value='HKD'>HKD</option>\n"
+"\t\t\t<option value='HUF'>HUF</option>\n"
+"\t\t\t<option value='ILS'>ILS</option>\n"
+"\t\t\t<option value='BRL'>BRL</option>\n"
+"\t\t\t<option value='JPY'>JPY</option>\n"
+"\t\t\t<option value='MYR'>MYR</option>\n"
+"\t\t\t<option value='PHP'>PHP</option>\n"
+"\t\t\t<option value='SGD'>SGD</option>\n"
+"\t\t\t<option value='TWD'>TWD</option>\n"
+"\t\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
+"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
+"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
+"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
+"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
+"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
+"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t\t<option value='EUR'>EUR</option>\n"
+"\t\t\t<option value='USD'>USD</option>\n"
+"\t\t\t<option value='GBP'>GBP</option>\n"
+"\t\t\t<option value='CAD'>CAD</option>\n"
+"\t\t\t<option value='AUD'>AUD</option>\n"
+"\t\t\t<option value='NZD'>NZD</option>\n"
+"\t\t\t<option value='SEK'>SEK</option>\n"
+"\t\t\t<option value='CZK'>CZK</option>\n"
+"\t\t\t<option value='PLN'>PLN</option>\n"
+"\t\t\t<option value='DKK'>DKK</option>\n"
+"\t\t\t<option value='NOK'>NOK</option>\n"
+"\t\t\t<option value='MXN'>MXN</option>\n"
+"\t\t\t<option value='CHF'>CHF</option>\n"
+"\t\t\t<option value='HKD'>HKD</option>\n"
+"\t\t\t<option value='HUF'>HUF</option>\n"
+"\t\t\t<option value='ILS'>ILS</option>\n"
+"\t\t\t<option value='BRL'>BRL</option>\n"
+"\t\t\t<option value='JPY'>JPY</option>\n"
+"\t\t\t<option value='MYR'>MYR</option>\n"
+"\t\t\t<option value='PHP'>PHP</option>\n"
+"\t\t\t<option value='SGD'>SGD</option>\n"
+"\t\t\t<option value='TWD'>TWD</option>\n"
+"\t\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">mensal</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">trimestral</label>\n"
+"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">anual</label>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Inscrever\" class=\"button\" />\n"
+"</form>\n"
+
+#. type: Title ###
+#, no-wrap
+msgid "Make a one-time donation"
+msgstr "Faça uma única doação"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
+"\t<input name='cmd' type='hidden' value='_donations' />\n"
+"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
+"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
+"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t<option value='EUR'>EUR</option>\n"
+"\t\t<option value='USD'>USD</option>\n"
+"\t\t<option value='GBP'>GBP</option>\n"
+"\t\t<option value='CAD'>CAD</option>\n"
+"\t\t<option value='AUD'>AUD</option>\n"
+"\t\t<option value='NZD'>NZD</option>\n"
+"\t\t<option value='SEK'>SEK</option>\n"
+"\t\t<option value='CZK'>CZK</option>\n"
+"\t\t<option value='PLN'>PLN</option>\n"
+"\t\t<option value='DKK'>DKK</option>\n"
+"\t\t<option value='NOK'>NOK</option>\n"
+"\t\t<option value='MXN'>MXN</option>\n"
+"\t\t<option value='CHF'>CHF</option>\n"
+"\t\t<option value='HKD'>HKD</option>\n"
+"\t\t<option value='HUF'>HUF</option>\n"
+"\t\t<option value='ILS'>ILS</option>\n"
+"\t\t<option value='BRL'>BRL</option>\n"
+"\t\t<option value='JPY'>JPY</option>\n"
+"\t\t<option value='MYR'>MYR</option>\n"
+"\t\t<option value='PHP'>PHP</option>\n"
+"\t\t<option value='SGD'>SGD</option>\n"
+"\t\t<option value='TWD'>TWD</option>\n"
+"\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
+"</form>\n"
+msgstr ""
+"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
+"\t<input name='cmd' type='hidden' value='_donations' />\n"
+"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
+"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
+"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
+"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
+"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">valor personalizado</label>\n"
+"\t<select name=\"currency_code\">\n"
+"\t\t<option value='EUR'>EUR</option>\n"
+"\t\t<option value='USD'>USD</option>\n"
+"\t\t<option value='GBP'>GBP</option>\n"
+"\t\t<option value='CAD'>CAD</option>\n"
+"\t\t<option value='AUD'>AUD</option>\n"
+"\t\t<option value='NZD'>NZD</option>\n"
+"\t\t<option value='SEK'>SEK</option>\n"
+"\t\t<option value='CZK'>CZK</option>\n"
+"\t\t<option value='PLN'>PLN</option>\n"
+"\t\t<option value='DKK'>DKK</option>\n"
+"\t\t<option value='NOK'>NOK</option>\n"
+"\t\t<option value='MXN'>MXN</option>\n"
+"\t\t<option value='CHF'>CHF</option>\n"
+"\t\t<option value='HKD'>HKD</option>\n"
+"\t\t<option value='HUF'>HUF</option>\n"
+"\t\t<option value='ILS'>ILS</option>\n"
+"\t\t<option value='BRL'>BRL</option>\n"
+"\t\t<option value='JPY'>JPY</option>\n"
+"\t\t<option value='MYR'>MYR</option>\n"
+"\t\t<option value='PHP'>PHP</option>\n"
+"\t\t<option value='SGD'>SGD</option>\n"
+"\t\t<option value='TWD'>TWD</option>\n"
+"\t\t<option value='THB'>THB</option>\n"
+"\t</select>\n"
+"\t<br/>\n"
+"\t<input type=\"submit\" value=\"Doe\" class=\"button\" />\n"
+"</form>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "How does Tails use this money?\n"
+msgstr "Como o Tails usa este dinheiro?\n"
+
+#. type: Plain text
+msgid ""
+"Our [[financial documents|doc/about/finances]] are available for your review."
+msgstr ""
+"Nossos [[documentos financeiros|doc/about/finances]] estão disponíveis para "
+"seu escrutínio."
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index 1d66721..26746df 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -56,6 +56,14 @@ Else, new versions are announced on:
HTTP
====
+<div class="note">
+
+<p>We cannot add more mirrors to our DNS pool at the moment because of a <a
+href="https://trac.torproject.org/projects/tor/ticket/11741">bug in the Tor
+resolver</a> that prevents us from having more than around 25 mirrors.</p>
+
+</div>
+
To efficiently help Tails users downloading it over HTTP, one needs to
have sufficiently privileged access to a web server with decent
bandwidth: a domestic DSL connection won't help; neither will a shared
@@ -67,11 +75,13 @@ a normal day, and twice as much for a short period after each release.
So, it is a must to be able to push at least 2 [[!wikipedia TiB]]
a month, and preferably 3 or 4 TiB.
+You will also need around 5-10 GiB of disk space.
+
If you satisfy these practical requirements, please read on!
Else, please consider seeding Tails images over BitTorrent instead.
Before starting doing any real work on this topic, please get in touch
-(<tails@boum.org>, [[OpenPGP key|doc/about/openpgp_keys]]) and send us
+(<tails@boum.org>, [[OpenPGP key|doc/about/openpgp_keys#private]]) and send us
your OpenPGP public key, so that any further communication between us
can be properly encrypted and authenticated.
diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn
index 48608fd..5178c36 100644
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -13,295 +13,67 @@ Welcome aboard!</p>
Most of Tails developers are not native English speakers so you're
more than welcome to correct or improve our English.
-For this, you can either follow the [[Git workflow|translate#git]] or
+For this, you can either follow the [[Git workflow|translate/with_Git]] or
[[propose|contribute/talk]] another way that suits you better to share
your improvements with us.
<a id="translate"></a>
-# Translate Tails
+# Translate Tails custom programs
You can help correct, improve, or complete the translations of Tails
-programs and documentation into your native language:
+programs into your native language:
-* **For French**, the existing translators
- team uses Git. So, read [[translating with Git|translate#git]].
+* **For French**, the translation team uses Git. Read its [[dedicated
+ documentation|translate/team/fr]] for translators.
* **For other languages**, read [[translating with
- Transifex|translate#transifex]].
-* However, this website is [[translated with Git|translate#git]]
- in **all languages**.
+ Transifex|translate/with_Transifex]].
+ Tails programs can be translated into more than 140 languages this way.
-<a id="transifex"></a>
+# Translate this website
-## With Transifex
+You can also translate this website, which includes the Tails
+[[documentation|doc]]. This is done [[translate/with_Git]].
-Most of Tails can be translated directly online after logging in with
-[Transifex](http://docs.transifex.com/):
+The translations are peer-reviewed and thus, you need to get into contact with
+a language team if you want to participate.
+In general, you can contact the translation teams via the
+[[mailing list for translators|translate#follow-up]].
-- [Tails
-Greeter](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-greeter-pot/)
-- [Tails Persistence
-Setup](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-persistence-setup-pot/)
-- [Tails Installer](https://www.transifex.com/projects/p/torproject/resource/3-tails-liveusb-creator-pot/)
-- [Tails Upgrader](https://www.transifex.com/projects/p/torproject/resource/tails-tails-iukpot/)
-- [Tails Perl library](https://www.transifex.com/projects/p/torproject/resource/tails-tails-perl5lib/)
-- [WhisperBack](https://www.transifex.com/projects/p/torproject/resource/3-whisperback-whisperback-pot/)
-- [A set of various translatable strings](https://www.transifex.com/projects/p/torproject/resource/tails-misc/)
+<a id="language-teams"></a>
-You are now doing translation work for Tails on Transifex. This is
-great, thanks!
+Currently, there are three active **language teams**:
-Beware, we don't host Transifex.com, they do have their own privacy policy.
+* [[French|translate/team/fr]]
+* [[German|translate/team/de]]
+* [[Portuguese|translate/team/pt]]
-Further:
+and three new language teams are being set up:
-- It would be awesome if you did [[follow-up on
- translation needs|translate#follow-up]].
-- You might want to [[translate the Tails
- website|translate#new-language]] too.
+* Italian
+* Spanish
+* Turkish
-<a id="git"></a>
-
-## Translation team using Git
-
-On the long run, translators team often decide to use [[Git]] to share and
-synchronize their work, and ask us to integrate it within the
-official repositories.
-
-### What can be translated
-
-Various bits of text can be translated:
-
-* **Custom programs** (Tails Greeter, Tails Persistence Setup, Tails
- Installer, Tails Upgrader, Tails Perl library and WhisperBack): each
- one has its own [[Git repository|contribute/git]], where PO files
- live in the `po` directory. Some have a `README.translators` at the
- root of their source tree: please read it.
-* **A set of various translatable strings** live in the `po`
- directory, in the `devel`
- branch of the [[main Tails Git repository|contribute/Git]].
-* **This website** must be translated in the `master` branch of the
- [[main Tails Git repository|contribute/Git]]. Please note [[there
- are requirements|translate#new-language]] to translate the website
- into a new language.
-
-### gettext
-
-The translation system used to translate Tails is called <span
-class="application">[[!wikipedia gettext]]</span>. Every sentence that
-needs to be translated is written in a [PO
-file](https://www.gnu.org/software/gettext/manual/gettext.html#PO-Files).
-
-To edit these PO files, we recommend that you use <span
-class="application">[Poedit](http://www.poedit.net/screenshots.php)</span>, a
-cross-platform editor for PO
-files. <span class="application">Poedit</span> is included in Tails.
-
-Please ensure that you use at least version 1.5 of Poedit, as this version
-handles line breaks of our files correctly.
-
-When setting up Poedit, you might want to ensure to use "Tails translators"
-or "Tails developers" as translator name and "tails@boum.org" as translator
-contact email address.
-
-If you do not use Poedit, but for example Vim or Emacs with the po-plugin, please
-verify for each translation that the syntax of the files is not broken. In order to do
-do so, please refer to the [[localization tricks page|contribute/l10n_tricks]].
-
-If there is no existing PO file for your language, you can copy the
-corresponding `.pot` file into a new `.po` file.
-
-When working on the website translation, it is highly recommended that you
-[[build the wiki locally|contribute/build/website/]] in order to verify
-your modifications or to review the translations of somebody else.
-
-### Workflow
-
-You can take advantage of Git to send us your work by asking us to
-pull from your Git branch. Here is the typical workflow used by Tails
-translators teams:
-
-1. Set up your personal [[Git repository|contribute/git]]: if you
- already know where to host it in a public place, this is great;
- else, [fork us on repo.or.cz](http://repo.or.cz/w/tails.git) or ask
- the Tails system administrators (<tails-sysadmins@boum.org>) to host
- your repository.
-
- On your computer, set up the repository. This example clones
- an empty repository into the "tails" folder:
-
- `git clone http://repo.or.cz/r/tails/yourrepo.git tails`
-
-2. Then setup the remote Tails main repository:
-
- `cd tails`
-
- `git remote add tails https://git-tails.immerda.ch/tails`
-
- Typing `git remote` should now show two entries:
-
- `origin
- tails`
-
- "origin" is your own repository, "tails" contains the files of the
- main repository once we fetch them. This operation requires some time
- at setup, as it requires to pull the whole repository.
-
- `git fetch tails master`
-
-3. Now to setup Git, type:
-
- `git config user.name "Tails developers"
- git config user.email "tails@boum.org"`
-
- Verify this configuration by typing:
-
- `git config --list`
-
-4. Create a branch for every translation you make, for example, if you want to
- translate the "contribute" page, create a branch named "translation-contribute":
-
- `git branch translation-contribute`
-
- `git checkout translation-contribute`
-
- Now typing `git branch` should show a star in front of the active branch.
-
-5. Translate whatever you can in your preferred PO file editor.
-
-6. Commit the changes you made to `.po` files:
-
- `git add <files>`
-
- `git commit <files>`
-
-7. Merge our main repository into yours.
- Regularly, pull from the master branch of the main repository to update
- your local files.
-
- `git fetch tails master` only fetches new files,
-
- `git pull tails master` fetches and merges the files.
-
-8. Push your changes to your online Git repository.
-
- `git push origin <name of branch>`
-
- `git push origin translation-contribute`
-
-9. Ask other members of your translation team to review your work by writing
- an email to [[the mailing list for
- translators|translate#follow-up]], containing in its subject
- "(Review)" and the short code for the translated language, for example "[fr]".
-
-10. The reviewer, once happy with the result, should ask on the
- [[mailing list for translators|translate#follow-up]] to pull from
- the branch that was worked on, writing an email with "(pull)" and the language
- short code in the subject. Ideally, such email would be OpenPGP-signed.
-
-You might want to consider using Git over Tor, for example, by using a Tails device when you translate.
-
-Read more about the Tails [[Git|contribute/git]] setup.
-
-### Let's get organized
-
-You are now doing translation work for Tails using Git. This is great,
-thanks! It would be awesome if you did [[follow-up on translation
-needs|translate#follow-up]].
-
-### Team duties
-
-Our custom programs can be translated [[using
-Transifex|translate#transifex]]. Work done there is not automatically
-synchronized with the translations your team does in Git.
-
-It is nice to minimize time wasted by unknown people who work, with
-Transifex, on the same thing as your translation team.
-
-So, a translation team using Git should regularly contact Transifex
-translators (listed in the `Last-translator` field of the PO files one
-can download from Transifex), either over email or using the Transifex
-interface, to:
-
-1. Thank them for translating Tails stuff.
-2. Make it clear their work is not imported (and is therefore, well,
- useless).
-3. Invite them to join the team and share the team's
- preferred workflow.
-4. Invite them to subscribe to [[the mailing list for
- translators|translate#follow-up]].
-
-<a id="new-language"></a>
-
-# Translate this website into a new language
-
-There are already some active website translation teams,
-coordinating via the [[mailing list for translators|translate#follow-up]].
-
-So, you want the Tails website to be available in a new language.
-Please keep in mind that it represents quite a lot of work.
-
-Therefore, here are a few things that would be required in order to start
-translating the Tails website to a new language:
-
-1. A team of translators, not just one person, is necessary. That also
- allows for peer reviews between the team, more flexibility for
- example when an important deadline arrives.
-
-2. At least part of the team should subscribe to the [[mailing list
- for translators|translate#follow-up]].
-
-3. Since the content of the website is sensitive in terms of privacy
- protection, Tails developers need to establish contacts with
- trusted people to review the work from time to time.
-
-4. For translations to be useful, they need to be maintained in the
- long run. This takes a few hours a month.
-
-Once those conditions are fulfilled, the new team can start working on a first
-batch of translations.
-
- - The Tails custom programs, as [[documented earlier|translate#translate]]
-
- - Important parts of our website:
-
- - [[/index]]
- - [[/about]] page
- - [[/getting_started]] page
- - [[/support]] page
- - [[/download]] page
- - [[/doc/about]] section
- - [[/doc/first_steps]] section
-
- See the exhaustive list of [[core pages|l10n_tricks/core_po_files.txt]].
-
-Do not hesitate to report the progress of your work on the [[mailing list for
-translators|translate#follow-up]].
+If your language is not listed here, read the documentation
+to [[add a new language|translate/team/new]].
<a id="follow-up"></a>
-# Follow-up on translation needs
+# Mailing list for translators
+
+Translators coordinate on the tails-l10n mailing
+list (*l10n* stands for [[!wikipedia Software_localization desc="localization"]]).
-Translators coordinate on the tails-l10n mailing list (*l10n* stands
-for [[!wikipedia Software_localization desc="localization"]]).
-Important changes to translatable strings are announced there.
+This is where important changes to translatable strings are announced.
+So, please subscribe to the list if you want to become a regular
+translator:
-Please <a href='https://mailman.boum.org/listinfo/tails-l10n/'>subscribe</a> to
-the list if you want to become a regular translator.
+<form method="POST" action="https://mailman.boum.org/subscribe/tails-l10n">
+ <input class="text" name="email" value=""/>
+ <input class="button" type="submit" value="Subscribe"/>
+</form>
Any message sent to this list is stored in a [public
archive](https://mailman.boum.org/pipermail/tails-l10n/), so beware of
what your email content and headers reveal about yourself: location,
IP address, email subject and content, etc.
-
-You can consult this
-[archive](https://mailman.boum.org/pipermail/tails-l10n/) to search
-for recent translation requests.
-
-See also the [translation
-tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=144)
-on Redmine.
-
-# Resources
-
-- The [[localization tricks page|contribute/l10n_tricks]]
diff --git a/wiki/src/contribute/how/translate/team/de.mdwn b/wiki/src/contribute/how/translate/team/de.mdwn
new file mode 100644
index 0000000..61f7e68
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/de.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Translate Tails into German"]]
+
+# Glossaries used by the German translation team
+
+We try to follow the [GNOME Guidelines](https://wiki.gnome.org/de/Uebersetzung)
+and their glossaries:
+
+* <https://wiki.gnome.org/de/StandardUebersetzungen>
+* <https://wiki.gnome.org/de/Uebersetzung/Dokumentationen>
+
+For words not in these lists it is helpful to see
+how they are translated (or not translated) in Wikipedia.
diff --git a/wiki/src/contribute/how/translate/team/fr.mdwn b/wiki/src/contribute/how/translate/team/fr.mdwn
new file mode 100644
index 0000000..ea178b6
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/fr.mdwn
@@ -0,0 +1,65 @@
+[[!meta title="Translate Tails into French"]]
+
+**For French**, the existing translation team uses Git.
+Please read the documentation about [[translating with
+Git|translate/with_Git]] first.
+
+[[!toc levels=2]]
+
+# What can be translated
+
+For French, various bits of text can be translated via Git:
+
+* **Custom programs**: each one has its own Git repository, where PO files live in the `po` directory.
+ Some have a `README.translators` at the root of their source tree: please read it.
+
+ Here is a list of these repositories:
+ [Tails Greeter](https://git-tails.immerda.ch/greeter),
+ [Tails Persistence Setup](https://git-tails.immerda.ch/persistence-setup),
+ [Tails Installer](https://git-tails.immerda.ch/liveusb-creator),
+ [Tails Upgrader](https://git-tails.immerda.ch/iuk),
+ [Tails Perl library](https://git-tails.immerda.ch/perl5lib)
+ and [WhisperBack](https://git-tails.immerda.ch/whisperback).
+
+* **A set of various translatable strings** live in the `po`
+ directory, in [the `devel` branch of the main Tails Git
+ repository](https://git-tails.immerda.ch/tails/log/?h=devel).
+
+* **This website** must be translated in the `master` branch of the
+ [main Tails Git repository](https://git-tails.immerda.ch/tails/).
+
+# Contributors' repositories
+
+* matsa: [[http://repo.or.cz/w/tails/matsa.git]]
+* mercedes508: [[https://git-tails.immerda.ch/mercedes508]]
+* seb35: [[https://git-tails.immerda.ch/seb35]]
+
+# Glossaries
+
+A [French glossary](https://www.transifex.com/projects/p/torproject/glossary/l/fr/)
+is [hosted by the Tor Project on Transifex](https://blog.torproject.org/blog/introducing-tor-translation-glossary).
+
+See also [amaGama](https://amagama-live.translatehouse.org/),
+which aims to "gather FOSS translations together in one place".
+
+# Team duties
+
+Our custom programs can be translated [[using
+Transifex|translate/with_Transifex]]. Work done there is not automatically
+synchronized with the translations your team does in Git.
+
+It is nice to minimize time wasted by unknown people who work, with
+Transifex, on the same thing as your translation team.
+
+So, a translation team using Git should regularly contact Transifex
+translators (listed in the `Last-translator` field of the PO files one
+can download from Transifex), either over email or using the Transifex
+interface, to:
+
+1. Thank them for translating Tails stuff.
+2. Make it clear their work is not imported (and is therefore, well,
+ useless).
+3. Invite them to join the team and share the team's
+ preferred workflow.
+4. Invite them to subscribe to [[the mailing list for
+ translators|translate#follow-up]].
diff --git a/wiki/src/contribute/how/translate/team/new.mdwn b/wiki/src/contribute/how/translate/team/new.mdwn
new file mode 100644
index 0000000..2600106
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/new.mdwn
@@ -0,0 +1,46 @@
+[[!meta title="Translate Tails website into a new language"]]
+
+There are already some active website translation teams,
+coordinating via the [[mailing list for translators|translate#follow-up]].
+
+So, you want the Tails website to be available in a new language.
+Please keep in mind that it represents quite a lot of work.
+
+Therefore, here are a few things that would be required in order to start
+translating the Tails website to a new language:
+
+1. A team of translators, not just one person, is necessary.
+ This allows for peer reviews between team members. It also makes it
+ easier to handle both scheduled and unexpected deadlines.
+
+2. At least part of the team should subscribe to the [[mailing list
+ for translators|translate#follow-up]].
+
+3. For translations to be useful, they need to be maintained in the
+ long run. This takes a few hours a month.
+
+Once those conditions are fulfilled, the new team can start working on a first
+batch of translations:
+
+ - The Tails custom programs, as [[documented earlier|translate#translate]]
+
+ - Important parts of our website:
+
+ - [[/index]]
+ - [[/about]] page
+ - [[/getting_started]] page
+ - [[/support]] page
+ - [[/download]] page
+ - [[/doc/about]] section
+ - [[/doc/first_steps]] section
+
+ See the exhaustive list of [[core pages|l10n_tricks/core_po_files.txt]].
+
+This may take some time. Don't get discouraged! Along the way, do not
+hesitate to report about your progress, and to ask for help, on the
+[[mailing list for translators|translate#follow-up]] :)
+
+Finally, in order to ease collaboration and to make it easier to join
+you, the new team should document what glossaries it uses, and what
+Git repositories are used by its members (see e.g. the [[French
+translation team's documentation|translate/team/fr]]).
diff --git a/wiki/src/contribute/how/translate/team/pt.mdwn b/wiki/src/contribute/how/translate/team/pt.mdwn
new file mode 100644
index 0000000..a183f8c
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/pt.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="Translate Tails into Portuguese"]]
+
+The Portuguese translation team uses its [[own mailing
+list|https://mailman.boum.org/listinfo/tails-l10n-pt-br/]].
diff --git a/wiki/src/contribute/how/translate/translation_progress.mdwn b/wiki/src/contribute/how/translate/translation_progress.mdwn
index 1ae71c4..f8e6844 100644
--- a/wiki/src/contribute/how/translate/translation_progress.mdwn
+++ b/wiki/src/contribute/how/translate/translation_progress.mdwn
@@ -1,23 +1,24 @@
[[!meta title="Translation progress"]]
This page lists pages that are not 100% translated into a language.
-To choose the language, select one of the "translation" links above.
-Note: This page itself does not need to be translated.
+Note: this page itself does not need to be translated.
-Note: The numbers count a page's incoming links, and thus, broadly, its importance.
+Note: the numbers count a page's incoming links, and thus, broadly, its importance.
-## Full list of all pages needing translation:
+[[!toc levels=1]]
-[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()"]]
+## All pages needing translation
-## Pages that are more than 80%, but less than 100% translated:
+[[!pagestats style=table pages="needstranslation()"]]
+
+## Pages that are more than 80%, but less than 100% translated
(Good to work on if you want to maximise the number of fully translated pages.)
-[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)"]]
+[[!pagestats style=table pages="needstranslation() and !needstranslation(80)"]]
-## Pages that are 80% or less translated:
+## Pages that are 80% or less translated
-[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)"]]
+[[!pagestats style=table pages="needstranslation(80)"]]
diff --git a/wiki/src/contribute/how/translate/with_Git.mdwn b/wiki/src/contribute/how/translate/with_Git.mdwn
new file mode 100644
index 0000000..15bd8fd
--- /dev/null
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
@@ -0,0 +1,196 @@
+[[!meta title="Translate Tails and its website using Git"]]
+
+While it is possible to translate Tails custom programs using Transifex,
+this website, which includes the Tails [[documentation|doc]], can only
+be translated using Git.
+
+This page explains how to get it up and running.
+
+[[!toc levels=2]]
+
+# Set up your tools
+
+We recommend to use Tails to do your translations as it contains all the tools
+you need to set up a working environment.
+
+If you want to use another operating system, these tools are:
+
+* Git - manage source code
+* Poedit - translate files
+* OpenSSH client - publish your translations on the server
+* tools to [[build the wiki locally|contribute/build/website/]] in
+ order to check how it will look like
+
+If you do not use Tails, please ensure that you use at least version 1.5 of Poedit,
+as this version handles line breaks correctly.
+
+The following instructions assume that you are using Tails.
+
+# How and what to translate?
+
+Once you have [[downloaded the Tails source code using Git|translate/with_Git#workflow]],
+you can find the website source files in `wiki/src`.
+
+The original website files are written in English, either in [[!wikipedia HTML]] or in [[!wikipedia Markdown]]. They have either a
+`.html` or a `.mdwn` extension.
+
+These original files are not to be modified by translators. Instead, look for a file with the
+same name, but with the extension `.po`. Before this extension you will find the language code,
+for example `fr` for French.
+
+To edit these PO files, we recommend that you use <span
+class="application">[Poedit](http://www.poedit.net/screenshots.php)</span>, a
+cross-platform editor for PO files.
+
+When setting up Poedit, you might want to ensure to use "Tails translators"
+or "Tails developers" as translator name and "tails@boum.org" as translator
+contact email address.
+
+If you do not use Poedit, but for example Vim or Emacs with the po-plugin, please
+verify for each translation that the syntax of the files is not broken. In order to do
+do so, please refer to the [[localization tricks page|contribute/l10n_tricks]].
+
+If there is no existing PO file for your language, you can copy the
+corresponding `.pot` file into a new `.po` file.
+
+<a id="workflow"></a>
+
+# Workflow
+
+Git makes it possible to work together on the same files and to track each modification.
+If you don't know Git yet, you might want to [[learn it first|contribute/git#learn_Git]].
+
+Here is the typical workflow used by Tails translation teams.
+
+If there is any point which you don't understand, please do not hesitate to
+ask on the [[mailing list for translators|translate#follow-up]], we will be glad to help you.
+
+1. **Set up your own repository**
+
+ In order to set up your own repository, you need to host it on a publicly accessible
+ Git server. There are a lot of websites providing you with such a possibility.
+
+ If you already know where to host it in a public place, this is great;
+ else, [fork us on repo.or.cz](http://repo.or.cz/w/tails.git) or ask
+ the Tails system administrators (<tails-sysadmins@boum.org>) to host
+ your repository.
+
+ You first need to setup a [[persistent volume|doc/first_steps/persistence]]
+ to save the source code. Then navigate to the persistent folder, using the terminal:
+
+ cd ~/Persistent
+
+ This example clones an empty repository into the "tails" folder:
+
+ git clone http://repo.or.cz/r/tails/yourrepo.git tails
+
+2. **Copy the source code from the main repository**
+
+ Then setup the remote Tails main repository:
+
+ cd tails
+ git remote add tails https://git-tails.immerda.ch/tails
+
+ Typing `git remote` should now show two entries:
+
+ origin
+ tails
+
+ More specifically, if you type `git remote -v` and you'll see something like this:
+
+ origin ssh://yourrepo@repo.or.cz/srv/git/tails/yourrepo.git (fetch)
+ origin ssh://yourrepo@repo.or.cz/srv/git/tails/yourrepo.git (push)
+ tails https://git-tails.immerda.ch/tails (fetch)
+ tails https://git-tails.immerda.ch/tails (push)
+
+ "origin" is your own repository, "tails" contains the files