summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-02-05 08:08:30 +0000
committerintrigeri <intrigeri@boum.org>2018-02-05 08:08:30 +0000
commitea2dcf9d3cc252ae4c66d2462c3803e2ba8ebcce (patch)
treeaf146e3dc8f1eb1f6085826801321d76c0f3b5b6
parent757375e0138a2dc3c8d86df073792067a5324fa3 (diff)
parenta319446f42971db00887b50e51f215ad3458cc4e (diff)
Merge remote-tracking branch 'origin/master' into stable
-rwxr-xr-xrefresh-translations10
-rw-r--r--wiki/src/.htaccess150
-rw-r--r--wiki/src/blueprint/Endless_upgrades.mdwn186
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn81
-rw-r--r--wiki/src/blueprint/SponsorW/2018_01.mdwn78
-rw-r--r--wiki/src/blueprint/Tails_inside_Qubes.mdwn0
-rw-r--r--wiki/src/blueprint/additional_software_packages.mdwn21
-rw-r--r--wiki/src/blueprint/additional_software_packages/gui.mdwn227
-rw-r--r--wiki/src/blueprint/interviews.mdwn (renamed from wiki/src/blueprint/intercept_interviews.mdwn)308
-rw-r--r--wiki/src/blueprint/l10n_Spanish.mdwn16
-rw-r--r--wiki/src/blueprint/mobile_messaging.mdwn67
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn3
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn43
-rw-r--r--wiki/src/blueprint/monthly_report/report_2018_01.mdwn150
-rw-r--r--wiki/src/blueprint/translation_platform.mdwn5
-rw-r--r--wiki/src/blueprint/usb_install_and_upgrade.mdwn49
-rw-r--r--wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn142
-rw-r--r--wiki/src/blueprint/veracrypt.mdwn50
-rw-r--r--wiki/src/blueprint/what_tails_is.mdwn3
-rw-r--r--wiki/src/contribute.de.po10
-rw-r--r--wiki/src/contribute.fa.po10
-rw-r--r--wiki/src/contribute.fr.po24
-rw-r--r--wiki/src/contribute.it.po10
-rw-r--r--wiki/src/contribute.mdwn4
-rw-r--r--wiki/src/contribute.pt.po10
-rw-r--r--wiki/src/contribute/calendar.mdwn30
-rw-r--r--wiki/src/contribute/design.mdwn2
-rw-r--r--wiki/src/contribute/how/documentation/style_guide.mdwn5
-rwxr-xr-xwiki/src/contribute/l10n_tricks/language_statistics.sh2
-rw-r--r--wiki/src/contribute/release_process.mdwn37
-rw-r--r--wiki/src/contribute/release_process/tails-iuk.mdwn6
-rw-r--r--wiki/src/contribute/reports/SponsorW/2017_12.mdwn2
-rw-r--r--wiki/src/contribute/sponsorship_to_attend_events.mdwn112
-rw-r--r--wiki/src/contribute/working_together/roles/sponsor_deliverables/team_manager.mdwn23
-rw-r--r--wiki/src/contribute/working_together/roles/sponsor_deliverables/worker.mdwn43
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.de.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fa.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po40
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.it.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.pt.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fa.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po41
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.it.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.inline.pt.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.fr.po51
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.it.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/mac_spoofing.pt.po7
-rw-r--r--wiki/src/donate.de.po19
-rw-r--r--wiki/src/donate.fa.po8
-rw-r--r--wiki/src/donate.fr.po19
-rw-r--r--wiki/src/donate.html4
-rw-r--r--wiki/src/donate.it.po21
-rw-r--r--wiki/src/donate.pt.po8
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po38
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po7
-rw-r--r--wiki/src/lib/partners/i2p.pngbin4505 -> 3603 bytes
-rw-r--r--wiki/src/local.css13
-rw-r--r--wiki/src/news/version_3.5.fr.po121
-rw-r--r--wiki/src/news/windows_camouflage_jessie.fr.po60
-rw-r--r--wiki/src/partners.fr.po110
-rw-r--r--wiki/src/partners/become.mdwn35
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.4.fr.po43
-rw-r--r--wiki/src/support/known_issues.fr.po11
-rw-r--r--wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml.pgp16
74 files changed, 2023 insertions, 684 deletions
diff --git a/refresh-translations b/refresh-translations
index 740e9fe..b0e84f0 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -134,15 +134,16 @@ intltool_merge_xml () {
### Main
-# Schedule clean up
-trap "rm -fr tmp/pot po/*.new po/*.orig" EXIT
-
FORCE=no
+KEEP_TMP_POT=no
while [ -n "${@:-}" ]; do
case "${1:-}" in
'--force')
FORCE=yes
;;
+ '--keep-tmp-pot')
+ KEEP_TMP_POT=yes
+ ;;
*)
echo "Unknown option: ${1}"
exit 1
@@ -151,6 +152,9 @@ while [ -n "${@:-}" ]; do
shift
done
+# Schedule clean up
+trap "rm -fr po/*.new po/*.orig ; [ "$KEEP_TMP_POT" = yes ] || rm -fr tmp/pot" EXIT
+
# Update POT files
mkdir -p tmp/pot
for prog in $PERL_PROGS ; do create_pot $prog Perl ; done
diff --git a/wiki/src/.htaccess b/wiki/src/.htaccess
index b28262a..eb96b44 100644
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -1,83 +1,83 @@
RewriteEngine on
RewriteBase /
-RewriteRule ^blueprint/additional_software_packages_offline_mode blueprint/additional_software_packages/offline_mode [R]
-RewriteRule ^bug_reporting doc/first_steps/bug_reporting [R]
-RewriteRule ^build contribute/build [R]
-RewriteRule ^bugs/FireGPG_may_be_unsafe doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks [R]
-RewriteRule ^chat support/chat [R]
-RewriteRule ^contribute/easy_tasks contribute/starter_tasks [R]
-RewriteRule ^contribute/how/donate donate [R]
+RewriteRule ^blueprint/additional_software_packages_offline_mode/?$ blueprint/additional_software_packages/offline_mode [R]
+RewriteRule ^bug_reporting/?$ doc/first_steps/bug_reporting [R]
+RewriteRule ^build/?$ contribute/build [R]
+RewriteRule ^bugs/FireGPG_may_be_unsafe/?$ doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks [R]
+RewriteRule ^chat/?$ support/chat [R]
+RewriteRule ^contribute/easy_tasks/?$ contribute/starter_tasks [R]
+RewriteRule ^contribute/how/donate/?$ donate [R]
RewriteRule ^contribute/l10n_tricks/git-clean-po.sh contribute/l10n_tricks/git-clean-po [R]
-RewriteRule ^contribute/signing_key_revocation doc/about/openpgp_keys/signing_key_revocation [R]
-RewriteRule ^contribute/working_together/roles/front_desk contribute/working_together/roles/help_desk [R]
-RewriteRule ^features doc/about/features [R]
-RewriteRule ^found_a_problem support/found_a_problem [R]
-RewriteRule ^git contribute/git [R]
-RewriteRule ^GnuPG_key doc/about/openpgp_keys [R]
-RewriteRule ^license doc/about/license [R]
-RewriteRule ^talk-dev about/contact#tails-dev [R,NE]
-RewriteRule ^talk-users support/talk [R]
-RewriteRule ^customize contribute/customize [R]
-RewriteRule ^support/truecrypt doc/encryption_and_privacy/truecrypt [R]
-RewriteRule ^support/virtualization doc/advanced_topics/virtualization [R]
-RewriteRule ^support/walkthrough doc [R]
-RewriteRule ^doc/anonymous_internet/iceweasel doc/anonymous_internet/Tor_Browser [R]
-RewriteRule ^doc/anonymous_internet/icedove doc/anonymous_internet/thunderbird [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/linux install/linux/usb/overview [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/windows install/win/usb/overview [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/mac install/mac/usb/overview [R]
-RewriteRule ^doc/first_steps/bridge_mode doc/first_steps/startup_options/bridge_mode [R]
-RewriteRule ^doc/first_steps/windows_theme doc/first_steps/startup_options/windows_camouflage [R]
-RewriteRule ^doc/trusting_tails_signing_key install/download#openpgp [R,NE]
-RewriteRule ^doc/first_steps/report_a_bug doc/first_steps/bug_reporting [R]
-RewriteRule ^doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked [R]
-RewriteRule ^doc/encryption_and_privacy/openpgp_passphrase_encryption doc/encryption_and_privacy/gpgapplet/passphrase_encryption [R]
-RewriteRule ^doc/encryption_and_privacy/openpgp_with_gedit doc/encryption_and_privacy/gpgapplet/public-key_cryptography [R]
-RewriteRule ^doc/advanced_topics/mac_changer doc/first_steps/startup_options/mac_spoofing [R]
-RewriteRule ^doc/first_steps/usb_installation doc/first_steps/installation [R]
-RewriteRule ^doc/first_steps/usb_reset doc/first_steps/reset [R]
-RewriteRule ^doc/first_steps/usb_reset/linux doc/first_steps/reset/linux [R]
-RewriteRule ^doc/first_steps/usb_reset/windows doc/first_steps/reset/windows [R]
-RewriteRule ^doc/first_steps/usb_upgrade doc/first_steps/upgrade [R]
-RewriteRule ^doc/first_steps/manual_usb_installation install [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/linux install/linux/usb/overview [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/windows install/win/usb/overview [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/mac install/mac/usb/overview [R]
-RewriteRule ^contribute/design/usb_installation contribute/design/installation [R]
-RewriteRule ^doc/sensitive_documents/audio doc/sensitive_documents/sound_and_video [R]
-RewriteRule ^blueprint/tails-greeter:_revamp_UI blueprint/greeter_revamp_UI [R]
-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]
+RewriteRule ^contribute/signing_key_revocation/?$ doc/about/openpgp_keys/signing_key_revocation [R]
+RewriteRule ^contribute/working_together/roles/front_desk/?$ contribute/working_together/roles/help_desk [R]
+RewriteRule ^features/?$ doc/about/features [R]
+RewriteRule ^found_a_problem/?$ support/found_a_problem [R]
+RewriteRule ^git/?$ contribute/git [R]
+RewriteRule ^GnuPG_key/?$ doc/about/openpgp_keys [R]
+RewriteRule ^license/?$ doc/about/license [R]
+RewriteRule ^talk-dev/?$ about/contact#tails-dev [R,NE]
+RewriteRule ^talk-users/?$ support/talk [R]
+RewriteRule ^customize/?$ contribute/customize [R]
+RewriteRule ^support/truecrypt/?$ doc/encryption_and_privacy/truecrypt [R]
+RewriteRule ^support/virtualization/?$ doc/advanced_topics/virtualization [R]
+RewriteRule ^support/walkthrough/?$ doc [R]
+RewriteRule ^doc/anonymous_internet/iceweasel/?$ doc/anonymous_internet/Tor_Browser [R]
+RewriteRule ^doc/anonymous_internet/icedove/?$ doc/anonymous_internet/thunderbird [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/linux/?$ install/linux/usb/overview [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/windows/?$ install/win/usb/overview [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/mac/?$ install/mac/usb/overview [R]
+RewriteRule ^doc/first_steps/bridge_mode/?$ doc/first_steps/startup_options/bridge_mode [R]
+RewriteRule ^doc/first_steps/windows_theme/?$ doc/first_steps/startup_options/windows_camouflage [R]
+RewriteRule ^doc/trusting_tails_signing_key/?$ install/download#openpgp [R,NE]
+RewriteRule ^doc/first_steps/report_a_bug/?$ doc/first_steps/bug_reporting [R]
+RewriteRule ^doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked/?$ doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked [R]
+RewriteRule ^doc/encryption_and_privacy/openpgp_passphrase_encryption/?$ doc/encryption_and_privacy/gpgapplet/passphrase_encryption [R]
+RewriteRule ^doc/encryption_and_privacy/openpgp_with_gedit/?$ doc/encryption_and_privacy/gpgapplet/public-key_cryptography [R]
+RewriteRule ^doc/advanced_topics/mac_changer/?$ doc/first_steps/startup_options/mac_spoofing [R]
+RewriteRule ^doc/first_steps/usb_installation/?$ doc/first_steps/installation [R]
+RewriteRule ^doc/first_steps/usb_reset/?$ doc/first_steps/reset [R]
+RewriteRule ^doc/first_steps/usb_reset/linux/?$ doc/first_steps/reset/linux [R]
+RewriteRule ^doc/first_steps/usb_reset/windows/?$ doc/first_steps/reset/windows [R]
+RewriteRule ^doc/first_steps/usb_upgrade/?$ doc/first_steps/upgrade [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/?$ install [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/linux/?$ install/linux/usb/overview [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/windows/?$ install/win/usb/overview [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/mac/?$ install/mac/usb/overview [R]
+RewriteRule ^contribute/design/usb_installation/?$ contribute/design/installation [R]
+RewriteRule ^doc/sensitive_documents/audio/?$ doc/sensitive_documents/sound_and_video [R]
+RewriteRule ^blueprint/tails-greeter:_revamp_UI/?$ blueprint/greeter_revamp_UI [R]
+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]
RewriteRule ^promote/(.*) contribute/how/promote/material/$1 [R]
RewriteRule ^download install [R]
-RewriteRule ^doc/first_steps/dvd install/dvd [R]
-RewriteRule ^doc/first_steps/installation install [R]
-RewriteRule ^doc/first_steps/installation/manual install [R]
-RewriteRule ^doc/first_steps/installation/manual/linux install/linux/usb/overview [R]
-RewriteRule ^doc/first_steps/installation/manual/mac install/mac/usb/overview [R]
-RewriteRule ^doc/first_steps/installation/manual/windows install/win/usb/overview [R]
-RewriteRule ^doc/get/trusting_tails_signing_key install/download#openpgp [R,NE]
-RewriteRule ^doc/get/verify_the_iso_image_using_gnome install/download#openpgp [R]
-RewriteRule ^doc/get/verify_the_iso_image_using_other_operating_systems install/download#openpgp [R]
-RewriteRule ^doc/get/verify_the_iso_image_using_the_command_line install/download#openpgp [R]
-RewriteRule ^doc/first_steps/bug_reporting/tails_does_not_start doc/first_steps/bug_reporting#does_not_start [R,NE]
-RewriteRule ^todo contribute/working_together/Redmine [R]
-RewriteRule ^wishlist contribute/working_together/Redmine [R]
-RewriteRule ^install/debian/clone/overview install/debian/clone-overview [R]
-RewriteRule ^install/debian/usb/overview install/debian/usb-overview [R]
-RewriteRule ^install/expert/usb/overview install/expert/usb-overview [R]
-RewriteRule ^install/linux/clone/overview install/linux/clone-overview [R]
-RewriteRule ^install/linux/usb/overview install/linux/usb-overview [R]
-RewriteRule ^install/mac/clone/overview install/mac/clone-overview [R]
-RewriteRule ^install/mac/dvd/overview install/mac/dvd-overview [R]
-RewriteRule ^install/mac/usb/overview install/mac/usb-overview [R]
-RewriteRule ^install/win/clone/overview install/win/clone-overview [R]
-RewriteRule ^install/win/usb/overview install/win/usb-overview [R]
-RewriteRule ^upgrade/clone/overview upgrade/clone-overview [R]
-RewriteRule ^upgrade/tails/overview upgrade/tails-overview [R]
-RewriteRule ^install/download/openpgp install/download#openpgp [R,NE]
-RewriteRule ^install/vm doc/advanced_topics/virtualization [R]
+RewriteRule ^doc/first_steps/dvd/?$ install/dvd [R]
+RewriteRule ^doc/first_steps/installation/?$ install [R]
+RewriteRule ^doc/first_steps/installation/manual/?$ install [R]
+RewriteRule ^doc/first_steps/installation/manual/linux/?$ install/linux/usb/overview [R]
+RewriteRule ^doc/first_steps/installation/manual/mac/?$ install/mac/usb/overview [R]
+RewriteRule ^doc/first_steps/installation/manual/windows/?$ install/win/usb/overview [R]
+RewriteRule ^doc/get/trusting_tails_signing_key/?$ install/download#openpgp [R,NE]
+RewriteRule ^doc/get/verify_the_iso_image_using_gnome/?$ install/download#openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_other_operating_systems/?$ install/download#openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_the_command_line/?$ install/download#openpgp [R]
+RewriteRule ^doc/first_steps/bug_reporting/tails_does_not_start/?$ doc/first_steps/bug_reporting#does_not_start [R,NE]
+RewriteRule ^todo/?$ contribute/working_together/Redmine [R]
+RewriteRule ^wishlist/?$ contribute/working_together/Redmine [R]
+RewriteRule ^install/debian/clone/overview/?$ install/debian/clone-overview [R]
+RewriteRule ^install/debian/usb/overview/?$ install/debian/usb-overview [R]
+RewriteRule ^install/expert/usb/overview/?$ install/expert/usb-overview [R]
+RewriteRule ^install/linux/clone/overview/?$ install/linux/clone-overview [R]
+RewriteRule ^install/linux/usb/overview/?$ install/linux/usb-overview [R]
+RewriteRule ^install/mac/clone/overview/?$ install/mac/clone-overview [R]
+RewriteRule ^install/mac/dvd/overview/?$ install/mac/dvd-overview [R]
+RewriteRule ^install/mac/usb/overview/?$ install/mac/usb-overview [R]
+RewriteRule ^install/win/clone/overview/?$ install/win/clone-overview [R]
+RewriteRule ^install/win/usb/overview/?$ install/win/usb-overview [R]
+RewriteRule ^upgrade/clone/overview/?$ upgrade/clone-overview [R]
+RewriteRule ^upgrade/tails/overview/?$ upgrade/tails-overview [R]
+RewriteRule ^install/download/openpgp/?$ install/download#openpgp [R,NE]
+RewriteRule ^install/vm/?$ doc/advanced_topics/virtualization [R]
# Legacy tickets URLs
RewriteRule ^todo/custom_plymouth_theme https://labs.riseup.net/code/issues/5948 [R]
diff --git a/wiki/src/blueprint/Endless_upgrades.mdwn b/wiki/src/blueprint/Endless_upgrades.mdwn
index 178b6ab..198ca2e 100644
--- a/wiki/src/blueprint/Endless_upgrades.mdwn
+++ b/wiki/src/blueprint/Endless_upgrades.mdwn
@@ -93,7 +93,64 @@ read-write outside of initramfs, it can be made read-only in a
slightly stronger sense on the block dev level. This is not really a
security feature, but more a foolproof things, but why not?
-# Auxilliary ideas
+<a id="non-nih"></a>
+
+## How others do i.e. non-NIH solutions
+
+This survey will be updated in a while with [[!tails_ticket 15277]].
+
+* yocto project's
+ [comparison of system update mechanisms](https://wiki.yoctoproject.org/wiki/System_Update)
+* [RAUC](https://rauc.readthedocs.io/en/latest/)
+ - manages
+ [boot loader](https://rauc.readthedocs.io/en/latest/integration.html#interfacing-with-the-bootloader)
+ and A/B partition setups, e.g.
+ [GRUB](https://rauc.readthedocs.io/en/latest/integration.html#grub)
+ ([example config file](https://github.com/rauc/rauc/blob/master/contrib/grub.conf))
+ and
+ [EFI](https://rauc.readthedocs.io/en/latest/integration.html#efi)
+ - systemd integration and D-Bus API
+ - super flexible
+ - no support for binary delta updates yet, but there's
+ a [RFC for casync support](https://github.com/rauc/rauc/pull/217)
+ which downloads only missing bits and downloads/applies with
+ streaming (no intermediate download of images)
+* [Qt's Over-The-Air Update](https://doc.qt.io/QtOTA/) aka. QtOTA,
+ that uses OSTree
+* XXX: other OSTree based designs/implementations?
+* XXX: other [casync](http://0pointer.net/blog/casync-a-tool-for-distributing-file-system-images.html) ([website](https://github.com/systemd/casync))
+ based designs/implementations?
+* XXX: how efficient is casync with SquashFS? in other words, do we
+ need to unpack the rootfs on the target system partition?
+* Chrome OS keeps the running system partition read-only, has _two_
+ system partitions, and the update is applied to the non-running one.
+ This has nice additional properties like allowing one to rollback if
+ the upgraded system doesn't start properly. More information about
+ their design and implementation:
+ - [disk format](https://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format)
+ - [file system and autoupdate system](https://www.chromium.org/chromium-os/chromiumos-design-docs/filesystem-autoupdate)
+ - [Android's A/B System Updates](https://source.android.com/devices/tech/ota/ab_updates.html)
+
+### Not suitable
+
+(but could be good sources of inspiration!)
+
+* EndlessOS'
+ [OSTree based upgrader](https://github.com/endlessm/eos-updater)
+ - supports separate poll/fetch/apply operations (so presumably we
+ could make the relevant partition read-write only after fetching,
+ as long a we can fetch to a tmpfs)
+ - daemon + D-Bus API
+ - systemd integration
+ - supports Flatpak
+ - likely too many EndlessOS-specific assumptions… and written in
+ C so difficult to adapt to our needs
+* [mender](https://mender.io/): downloads full update
+* [swabic's swupdate](https://sbabic.github.io/swupdate/): downloads
+ full update; binary delta updates are
+ [on the roadmap](https://sbabic.github.io/swupdate/roadmap.html#binary-delta-updates)
+
+# Auxiliary ideas
## Read-write system partition while the network is enabled
@@ -118,18 +175,9 @@ compromised while downloading the upgrade, it will still be
compromised when the download is finished and the system partition is
remounted read-write, and it can infect that part then.
-Chrome OS keeps the running system partition read-only, has _two_
-system partitions, and the update is applied to the non-running one.
-This has nice additional properties like allowing one to rollback if
-the upgraded system doesn't start properly. More information about
-their design and implementation:
-
-* [disk format](https://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format)
-* [file system and autoupdate system](https://www.chromium.org/chromium-os/chromiumos-design-docs/filesystem-autoupdate)
-* [Android's A/B System Updates](https://source.android.com/devices/tech/ota/ab_updates.html)
-
-[rauc](https://github.com/jluebbe/rauc) is a set of tools to implement
-a similar system.
+Note that with A/B system updates this discussion is moot: the
+bootloader configuration update is the only part of the process that
+requires read-write access.
## What about IUKs?
@@ -163,3 +211,115 @@ The ISOBoot case would still require a manifest of files we extract
from the ISO (bootloader code and configuration), but indeed that
manifest could be in the ISO itself, and thus its authenticity and
integrity would be signed/verified at the same time as the ISO.
+
+# Temporary stop gap: IUKs on steroids
+
+(This idea was originally conceived in the comments of [[!tails_ticket
+11131]].)
+
+Without any major redesign of our current incremental upgrade system
+(i.e. comparatively cheap) we can allow users upgrade only through
+IUKs for much longer, probably throughout a whole Tails series,
+e.g. all of Tails 2.x, which we'll use for our examples below since we
+moved to 3.x already so we have all data we need to test this idea.
+
+## Basic idea
+
+### Inside Tails
+
+* Tails Upgrader fetches the UDF for the version of Tails that was
+ originally installed (instead of the version of the running Tails),
+* We remove any previous IUK (and reference to it in `Tails.module`)
+ when a new IUK is installed.
+
+### Release management
+
+When we release version M.N, then, for all previous versions M.X since
+M.0, we generate a M.X_to_M.N IUK.
+
+(Actually, it is not necessary to choose the first release of a series
+(like M.0) as the "synchronization point". We could add another one
+half way through the series, or make every tenth release a
+synchronization point, or we could do it when when the IUK simply
+grows too big. We have lots of options to balance this according to
+our needs, but the first release of a series seems like a technically
+reasonable choice according to the data we have for the 2.x series
+(see below), but also nice from the user's PoV if the only time a
+manual upgrade is needed is when upgrading between series.)
+
+### Example
+
+1. I install Tails 2.2 on a USB stick.
+2. Later when Tails 2.3 is released I upgrade to it via the 2.2_to_2.3
+ IUK (i.e. identical to our original scheme).
+3. When Tails 2.4 is released I upgrade to it via the 2.2_to_2.4 IUK
+ (whereas in our original scheme we would stack 2.3_to_2.4 on top of
+ 2.2_to_2.3) and remove the 2.2_to_2.3 IUK (whereas in our original scheme
+ we never remove IUKs).
+
+Notice how step 3 can be repeated for each new release, so that we in
+the end reach the final release of the series, Tails 2.12. And notice
+how we in step 1 could have installed any 2.x release.
+
+## Problems due to IUK size
+
+We'll be dealing with larger IUKs (because generally more and more
+changes accumulate between different Tails versions) and only have one
+present at a time, with the exception being while we are installing a
+new IUK (then two will be present). Let's look at the IUK sizes
+towards the end of the 2.x series as if the last manual install was
+for Tails 2.0, which is the excepted worst case:
+
+ 569M Tails_i386_2.0_to_2.9.iuk
+ 678M Tails_i386_2.0_to_2.10.iuk
+ 682M Tails_i386_2.0_to_2.11.iuk
+ 634M Tails_i386_2.0_to_2.12.iuk
+
+The IUK size is involved in at least four concerns:
+
+* Disk space needs on mirrors: for 2.x there were 14 non-rc/beta/alpha
+ Tails releases, so there would be 13 IUKs for the last release
+ (2.12). So using the worst-case as the average case we get the upper
+ bound of the space needs on each mirror: 14*682 MB ~= 10 GB.
+* Disk space needs on the Tails system partition: we need to be able
+ to store two large IUKs. Apparently the worst case for 2.x is the
+ 2.10 to 2.11 upgrade if 2.0 was the version originally installed:
+ - The 2.0 installation itself uses 1082 MB, so upgraded to 2.10 the
+ total usage is 1082 MB + 678 MB = 1760 MB.
+ - Due to the Upgrader requiring 3x the size of the IUK on the Tails
+ system partition, the actual requirement is 1760 MB + 3*682 MB =
+ 3806 MB of free disk space. That wouldn't have worked during the
+ 2.x times, when the system partition was 2.5 GB, and it barely
+ would work with our current 4.0 GB partition. OTOH, during the 2.x
+ series we shipped two kernels, while we don't in 3.x, so we have
+ that in our favor.
+ - When both IUKs are present at the same time (i.e. before rebooting
+ after having applied the upgrade) the disk usage is 1760 MB + 682
+ MB = 2442 MB.
+ - After the old IUK is purged the disk usage is down to 2442 MB -
+ 678 MB = 1764 MB.
+* Memory needs: while performing the upgrade, 2x the size of the IUK
+ of memory is needed, so 2*682 MB = 1364 MB. On a system with 2 GB of
+ memory, a fresh boot of Tails 3.5 (without networking to limit the
+ amount of processes autostarting) has 1255 MB of free memory
+ (according to `check_free_memory()`'s calculation in
+ `config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper`)
+ so the upgrade would fail. This is a regression for users with 2 GB
+ memory: for all of 2.x and 3.x, all IUKs have been under 400 MB,
+ which would work fine with 2 GB of memory.
+* Bandwidth needs of the RM. Uploading 10 GB of IUKs can be a pain for
+ some of us, but that can easily be solved by making it possible to
+ generate IUKs on lizard (and then compare them with the ones you
+ generated locally. Thanks reproducibility!).
+
+## Support upgrading very old Tails
+
+We probably do not want to support upgrading very old (e.g. from six
+months ago) Tails installations because our signing key might have
+been updated in the meantime, and/or some critical update to Tails
+Upgrader (e.g. UDF version). So unless we want to spend a lot of
+resources on solving these problems, which roughly translates to "you
+can take long breaks from Tails", let's guarantee our current
+"you can at most skip one *planned* release" promise, and
+optimistically support older versions whose key and Tails Upgrader are
+still ok.
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 54bebf1..8eb819e 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -155,3 +155,84 @@ let's not include them in the fallback DNS pool:
# Initial research
See [[HTTP_mirror_pool/archive]].
+
+<a id="HTTPS"></a>
+
+# HTTPS mirrors
+
+We've already switched all our mirrors in the Javascript mirror-pool, handled
+by mirror-pool-dispatcher to HTTPS, but not all of our fallback mirrors
+([!tails_ticket #12833]).
+
+## Current problem space
+
+Round-Robin pool
+
+* we point to different IPs
+* round robin incompatible with different CNAMES
+* round robin uses IPs → incompatible with SSL certs
+* Asking mirror OPs to create SSL certs themselves and keep them updated is not
+ practicable.
+* Links to dl.a.b.o on website & UDFs point to the round robin. (used for
+ example on https://tails.boum.org/install/expert/usb/index.en.html)
+
+* Website, DAVE2 and IUKs use Javascript based mirror-pool-dispatcher.
+* Hardcoded URLs on the website need to be accessible & HTTPSified without
+ Javascript
+
+## Possible solutions
+
+### Server based solution
+
+We ruled this solution out when we first based the mirror-pool-dispatcher on
+Javascript. Likely, we'd want to avoir recreating such a complicated solution
+even if we will have to host our website ourselves and have this technical
+possibility.
+
+### One-mirror-only solution
+
+A very stable and big mirror should become the only fallback for non-JS users
+and the expert/wget installion method.
+
+* → We ditch the round-robin
+* → We monitor this server more often so that we can change it if ever it becomes inaccessible.
+
+## Todo now
+
+* deploy in lockstep on our live website:
+ - change fallback_download_url_prefix in mirror-pool-dispatcher [u]
+ - change all instances of http://dl.a.b.o → https://mirrors.wikimedia on our website [u]
+ - except in UDFs
+* ensure Tails 3.7 gets the updated mirror-pool-dispatcher submodule [i]
+* prepare a branch in iuk.git that updates UDF generation code (replace dl.a.b.o with mirrors.wikimedia) [i]
+* keep the fallback DNS pool running: it's still used by Tails Upgrader and we "support" skipping an upgrade (from 3.6 to 3.7) so it must remain working until 3.6 users can upgrade directly to 3.8
+* prepare a branch against mirrors.git to document the new setup and drop the obsolete crap
+* prepare a branch against tails.git to update the design doc
+
+## Whenever we want
+
+* tell wikimedia.org admins about our plans (before or after the change, whatever) [u]
+* update the documentation for mirror operators in a dedicated Git branch: delete the part about dl.a.b.o [u]
+* prepare a branch against mirror-pool.git that drops support for the DNS fallback pool [i]
+* prepare a branch against puppet-tails.git that drops support for the DNS fallback pool [i]
+
+## When releasing Tails 3.7 [bertagaz]
+
+* all UDFs for upgrades must still have dl.a.b.o because Tails 3.6 and older
+only support that (nothing special to do for that, just follow the release
+process doc)
+
+## When releasing Tails 3.8 [i]
+
+* all UDFs for upgrades from 3.6 must have dl.a.b.o
+* all UDFs for upgrades from 3.7 must have mirrors.wikimedia
+
+## A few weeks after Tails 3.8 is released
+
+* drop the dl.a.b.o fallback pool
+* merge the branch into iuk.git
+* merge the branch into mirror-pool.git
+* merge the doc branch into mirrors.git
+* merge the doc branch for mirror operators into tails.git
+* merge the updated design doc branch into tails.git
+* merge the branch into puppet-tails.git
diff --git a/wiki/src/blueprint/SponsorW/2018_01.mdwn b/wiki/src/blueprint/SponsorW/2018_01.mdwn
index 105f296..26805e9 100644
--- a/wiki/src/blueprint/SponsorW/2018_01.mdwn
+++ b/wiki/src/blueprint/SponsorW/2018_01.mdwn
@@ -8,6 +8,84 @@ Everything in this report is public.
# A. VeraCrypt support in GNOME
+<a id="additional_software"></a>
+
# B. Additional software
+## B.1 UX & UI design sprint
+
+The main developer and the UX designer working on this project gathered for
+three days of sprint in Berlin, at the Onion Space, a coworking space for
+Internet freedom technologists, on January 27, 28, and 29.
+
+We followed a very similar methodology as the one we described in more
+details when we reported on the [[UX design sprint for VeraCrypt support
+in GNOME|contribute/reports/SponsorW/2017_12#sprint]].
+
+### Design studio
+
+We started with a [design
+studio](https://articles.uie.com/design_studio_methodology/) to ideate
+and come up with a first design candidate.
+
+### Paper prototyping and formative testing with users
+
+We prepared paper prototypes of this first candidate. Over the week-end,
+we had 7 people come over for testing sessions of one hour each. After
+each test we debriefed our findings and improved our design.
+
+We selected people with diverse prior knowledge about how to install
+packages in Tails (and Linux in general). All were familiar with Tails
+(though in various degrees) but some were otherwise Windows or macOS
+users while some were Debian experts or used to Linux distributions with
+a different packaging system.
+
+### Output
+
+The full list of interfaces that we designed can be seen on our
+[[blueprint|blueprint/additional_software_packages/gui]].
+
+The complete XML wireframes are on
+[GitHub](https://github.com/sajolida/tails-wireframes/tree/master/additional%20software)
+and here are the most relevant parts.
+
+When installing a Debian package:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - add.png"/>
+
+When starting Tails with some additional packages configured:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installing.png"/>
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installed.png"/>
+
+Additional Software feature in the persistent storage configuration:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/persistent storage - configuration changed.png"/>
+
+Example list of additional software:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software.png"/>
+
+When no software has been added yet:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - empty.png"/>
+
+## B.2. Write technical design documentation
+
+Technical design has started, as documented on [[the blueprint|additional_software_packages/gui/]]
+
+## B.4. Implement backend and GUI
+
+Some backend code [started to be implemented](https://labs.riseup.net/code/issues/14594)
+
+## B.5. Implement offline mode
+
+[Implement Offline Mode for Additional Software Packages](https://labs.riseup.net/code/issues/14570) is ready to be merged in order to be included in the next Tails release.
+
+## B.8. Fix bugs and UX issues
+
+["Additional software" locks the opening of the desktop](https://labs.riseup.net/code/issues/9059) have been merged and will be released in the next Tails release.
+
+
# C. Deliver new features
diff --git a/wiki/src/blueprint/Tails_inside_Qubes.mdwn b/wiki/src/blueprint/Tails_inside_Qubes.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/Tails_inside_Qubes.mdwn
diff --git a/wiki/src/blueprint/additional_software_packages.mdwn b/wiki/src/blueprint/additional_software_packages.mdwn
index b0df5eb..935f3d0 100644
--- a/wiki/src/blueprint/additional_software_packages.mdwn
+++ b/wiki/src/blueprint/additional_software_packages.mdwn
@@ -1,12 +1,21 @@
[[!meta title="Additional software packages"]]
+[[!map pages="blueprint/additional_software_packages/*" show=title]]
-<div class="note">
-[[blueprint/remember_installed_packages]] overlaps with
-this blueprint.
-</div>
+The persistence feature for additional software packages is a great tool
+to make Tails more flexible for diverse scenarios without having to
+bloat the ISO image.
+
+The current limitations include:
+
+ - No user interface. Currently you have to edit a file as root. ([[!tails_ticket 5996 desc="#5996"]])
+
+ - Their Installation locks the opening of the desktop. ([[!tails_ticket 9059 desc="#9059"]])
+
+ - They are checked for updates every time Tor is restarted. ([[!tails_ticket 9819 desc="#9819"]])
+
+We are going to implement this feature for Tails 3.7 ([[!tails_ticket 9059 desc="#14593"]])
-[[!map pages="blueprint/additional_software_packages/*" show=title]]
Notes
=====
@@ -14,3 +23,5 @@ Notes
- Extract additional software lines from WhisperBack reports:
sed -i -n -e '/live-additional-software.conf =====$/,/^=====/{ /^=====/d; p; }'
+
+
diff --git a/wiki/src/blueprint/additional_software_packages/gui.mdwn b/wiki/src/blueprint/additional_software_packages/gui.mdwn
index 897033d..0d909bd 100644
--- a/wiki/src/blueprint/additional_software_packages/gui.mdwn
+++ b/wiki/src/blueprint/additional_software_packages/gui.mdwn
@@ -1,67 +1,202 @@
[[!meta title="User interface for additional software packages"]]
-The persistence feature for additional software packages is a great tool
-to make Tails more flexible for diverse scenarios without having to
-bloat the ISO image.
+[[!toc levels=2]]
-The current limitations include:
+Goals and non-goals
+===================
- - No user interface. Currently you have to edit a file as root. ([[!tails_ticket 5996 desc="#5996"]])
+- Allow people to choose to:
+ - Reinstall a package every time they start Tails.
+ - Stop reinstalling a package every time.
- - Their Installation locks the opening of the desktop. ([[!tails_ticket 9059 desc="#9059"]])
+- Integrate this in:
+ - The usual installation and removal process of a package (through
+ Synaptic, another graphical tool, or APT on the command line).
+ - The persistent storage configuration.
- - They are checked for updates every time Tor is restarted. ([[!tails_ticket 9819 desc="#9819"]])
+- Provide GNOME Packages as a better replacement for *Synaptic*.
+ [[!tails_ticket 15262]]
-We are going to implement this feature for Tails 3.7 ([[!tails_ticket 9059 desc="#14593"]])
+- We won't provide a way for people to specify which packages to install
+ outside of the usual installation process of a package. We only ask
+ people if they want to reinstall a package every time *after it has
+ been successfully installed a first time*.
-Proposed user experience
-========================
+Flow chart
+==========
-0. Have a way to enable the feature (and its dependencies) in
-*tails-persistence-setup*. This besically means cheking both
-*APT Lists* and *APT Packages Cache* (much welcome)
+<img src="https://labs.riseup.net/code/attachments/download/1886/asp-chart-installed.svg" width="150%" height="auto" />
-1. When installing a new package, either through the command line or
-through Synaptic, the user is asked whether she wants to make it
-persistent.
+<img src="https://labs.riseup.net/code/attachments/download/1887/asp-chart-removed.svg" width="150%" height="auto" />
-**XXX**: long-term wise, we should probably focus on _GNOME
-Software_ instead of _Synaptic_; if something works for both, fine,
-but the PackageKit D-Bus interface might be easier to support than
-hooking APT/dpkg, so one option would be to only support installation
-& removal done via PackageKit (i.e. either with _GNOME Software_ or
-using `pkcon` on the command line) and not operations done directly
-with `apt` or _Synaptic_.
+User interface
+==============
-2. When removing a persistent package, the user is asked whether she
-wants to remove it from the list of persistent packages.
+Notifications for addition and removal
+--------------------------------------
-3. Have a list of the persistent packages visible in the persistence
-wizard. As the user need to be able to check the state of this feature
-outside of APT operations.
+When the user installs a package either through the APT command line or a
+graphical interface like Synaptic, a notification is displayed to let them add
+or remove it from their list of additional software.
-4. Allow removing packages from the list in 3 (welcome).
+These notifications are triggered by APT hooks. In the backend, we would
+answer <em>Yes</em> to all debconf questions.
-5. Allow adding packages to the list in 3 (we don't really want that, do we?).
+### When a package is installed with a persistent storage unlocked
-Implementation
---------------
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - add.png"/>
- - 1 and 2 might be possible to implement using APT hooks or PackageKit
- DBus interface. We need to
- investigate how these hooks would communicate with the desktop
+### When a package is installed with no persistent storage
- - 3 might require modifying the general concept of the persistence
- wizard which is currently only a list of features that are activated
- or not, without feedback on the information managed by each of them.
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - add without persistent storage.png"/>
- - 4 should be easy to implement once we have 3 as removing packages
- from the list doesn't need any validity check. Note that we would
- always answer Yes to debconf questions.
+### When a package is installed with a persistent storage locked
- - 5 would require validating the packages added to the list to make
- sure that they can be installed. Installing packages on the fly as
- they are added to the list might help solving this.
+No notification.
- - We could merge both the **APT Packages** and **APT Lists**
- persistence features
+This notification could have education purposes: to tell people about
+this feature. But:
+
+- People who have a persistent storage but don't unlock it, probably do
+ this only sometimes and for a reason. They probably otherwise unlock
+ their persistent storage most of the time.
+
+- If they install packages with their persistent storage locked, they
+ probably do it with their persistent storage unlock as well and would
+ learn about this feature when it's most relevant for them.
+
+So let's not bother them when it's not worth it.
+
+### When a package is installed but it's impossible to have a persistent storage
+
+When running from a DVD, virtual machine, or intermediary Tails.
+
+To be displayed only once per session, not to bother people too much.
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - impossible persistent storage.png"/>
+
+### When a package is uninstalled
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - remove.png"/>
+
+Notifications when starting Tails with additional software
+----------------------------------------------------------
+
+If any additional software has been configured through the notifications from
+the previous sections, these packages are installed automatically from the
+persistent storage every time the user starts Tails.
+
+### When the installation starts
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installing.png"/>
+
+If the summary is too long (here 62 characters), use instead only:
+
+*Installing your additional software...*
+
+We added "*from persistent storage*" to inform better the mental model
+of users and clarify that these are not downloaded every time from the
+Internet. But we also made this clearer in the notification when
+installing.
+
+### When the installation succeeds
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installed.png"/>
+
+Notifications of failures
+-------------------------
+
+### When the installation fails
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installation failed.png"/>
+
+### When the upgrade fails
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - upgrade failed.png"/>
+
+Additional Software
+-------------------
+
+The list of additional software can be open from:
+
+- **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Additional Software**
+- **Applications**&nbsp;▸ **Tails**&nbsp;▸ **Additional Software**
+
+Why both? See [[!tails_ticket 5521]].
+
+### If there is no persistent storage
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - without persistent storage.png"/>
+
+### Before any package is added
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - empty.png"/>
+
+### When some packages are already added
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software.png"/>
+
+### When removing a package
+
+By clicking on the delete cross.
+
+Removing packages from the list doesn't require any validity check.
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - remove.png"/>
+
+### If the persistent storage is locked
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - locked persistent storage.png"/>
+
+### It is impossible to have a persistent storage
+
+For example, when running from a DVD or virtual machine.
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software - impossible persistent storage.png"/>
+
+Persistent storage configuration
+--------------------------------
+
+- MUST allow a feature to have a "Settings" button.
+
+- SHOULD modify the persistent storage configuration to replace the
+ **APT Packages** and **APT Lists** features by a single **Additional
+ Software** feature.
+
+- MAY replace the custom widgets of the persistent storage configuration
+ by the following GTK3 pattern:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/persistent storage - configuration changed.png"/>
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/persistent storage - confirm restart.png"/>
+
+### Backend
+
+- MUST allow querying for the activation of features (ASP)
+ programmatically. For example, through the command line or a DBus
+ method call.
+
+- MUST allow triggering persistence creation and then activate a feature
+ (ASP) programmatically.
+
+- SHOULD allow ASP to setup the feature between persistence creation and
+ persistence feature selection.
+
+Implementation notes
+====================
+
+## Components interaction
+
+<img src="https://labs.riseup.net/code/attachments/download/1877/asp-chart.svg" width="150%" height="auto" />
+
+<img src="https://labs.riseup.net/code/attachments/download/1878/asp-persistence-setup.svg" width="150%" height="auto" />
+
+[source](https://labs.riseup.net/code/attachments/download/1881/asp-chart.odg)
+
+### IPC
+
+IPC between `tails-additional-software` (root backend) and `tails-additional-software-notify` (user session notification frontend, think about `notify-send` with actions support cf. https://developer.gnome.org/notification-spec/#basic-design) is really basic: display this notification and tell me the answer. I think the easiest way to do that is just to fork as amnesia with sudo, then check the returncode.
+
+IPC between `tails-additional-software` and `tails-persistence-setup` carries "Persistence-setup, please setup persistence with ASP" and "ASP, you can go on". It could be done the same way, but it may be worth having a persistence-setup DBus service on the system bus (which we already though when considering integrating it in the greeter).
+
+IPC between `tails-additional-software-configuration` (user session configuration interface) and `tails-additional-software` carries the list entries to remove from ASP. It may be done via `sudo` or via DBus system service, but I don't think it's worth it.
diff --git a/wiki/src/blueprint/intercept_interviews.mdwn b/wiki/src/blueprint/interviews.mdwn
index 2e366f9..5077ee0 100644
--- a/wiki/src/blueprint/intercept_interviews.mdwn
+++ b/wiki/src/blueprint/interviews.mdwn
@@ -1,9 +1,11 @@
-[[!meta title="Intercept interviews"]]
+[[!meta title="Interviews of users"]]
-We are collecting here summaries and insights from intercept interviews
+We are collecting here summaries and insights from interviews
with Tails users.
-[Intercept Interviews](http://internetfreedom.secondmuse.com/framework-elements/intercept-interviews/)
-are designed to increase understanding and dialogue through a series of
+
+In their shortest form, these can be
+[intercept Interviews](http://internetfreedom.secondmuse.com/framework-elements/intercept-interviews/)
+that are designed to increase understanding and dialogue through a series of
quick questions that take no more than 10 to 15 minutes of dialogue.
The email address of the interviewees are stored in the internal Git
@@ -21,8 +23,8 @@ of gender, language, and age. For list of popular given names see:
HOWTO
=====
-Interview script
-----------------
+Intercept interview script
+--------------------------
- Introduction
- Who I am, what I am doing, and why I'm conducting the interview.
@@ -54,6 +56,22 @@ Interview script
- Do you know of anybody else using Tails and that would be worth
interviewing?
+Resources on interviewing users
+-------------------------------
+
+- [Steve Portial, _Interviewing Users_](http://gen.lib.rus.ec/search.php?req=steve+portigal+interviewing+users)
+
+Tips when taking notes
+----------------------
+
+- Whenever possible, try to transcribe the language, mental model, and
+ understanding of the interviewee. The interviewee might use a
+ different word than what we usual use (for example, "permanent"
+ instead of "persistent") or think that something is not possible in
+ Tails while it is. Don't correct them during the interview (you can
+ clarify things that could be helpful for them at the very end) and
+ transcribe this in your summary.
+
Template email for validating the output
----------------------------------------
@@ -67,6 +85,258 @@ Template email for validating the output
Interviews
==========
+<a id="additional_software"></a>
+
+Additional Software UX sprint, January 2018
+-------------------------------------------
+
+We asked the participants what the one thing that they would change in
+Tails if they had a magic wand:
+
+- P1: Make the installation easier from Windows. They had problems once
+ creating the persistent storage.
+- P2: Upgrades!
+- P3: Make it easier to log into captive portals. They had to do this
+ once and it was super hard to figure out.
+- P4: Allowing creating the persistent storage from Tails Greeter. And
+ upgrades!
+- P7: Remove the need to configure the keyboard and language every time.
+
+<a id="Claudia"></a>
+
+Claudia & Felix, January 2018
+-----------------------------
+
+Claudia and Felix are reporters working in a journalists organization in
+Latin America. They investigate and report on issues such as
+human-rights violations, enforced disappearances, drug trafficking but
+always with a focus on the social impacts.
+
+Their organization has been collaborating with others on a shared
+whistleblowing platform for some years.
+
+Claudia has been designated by her organization to be the person in
+charge of the whistleblowing platform. She has an OpenPGP key to
+communicate with other organization on the platform but she only uses it
+for that. Actually, right now it's expired.
+
+Felix is a sociologist but he "likes machines" so people call him
+whenever a computer issue pops up in the office as they don't have a
+dedicated computer person.
+
+Most journalists in their office use Mac but their administrative staff
+run Windows.
+
+### Whistleblowing platform
+
+The whistleblowing platform was set up by a tech organization from
+abroad. They gave each organization some training on the platform and a
+dedicated laptop to access it only from Tails. The training was focused
+on the platform, so they didn't receive a proper training on Tails
+itself. In general, little technical support was provided after the
+platform was installed.
+
+Though the dedicated laptop seemed to be new, Tails takes 2-3 minutes to
+start. Maybe it's because of the computer but they don't really know
+because they didn't try it on another computer. All organizations
+collaborating on the whistleblowing platform received the same machine
+and some gave up on using it. They probably got the worse computer in
+the world!
+
+It was not clear to them whether it was safe against malware to start
+Tails from their personal computer instead of the dedicated computer.
+
+When working on leaked documents, they download them from Tails but do
+the real work from their own computers.
+
+The first year Tails worked very well. But then they started having more
+problems when the upgrades started.
+
+### They know they should do more for their digital security
+
+Their organization is aware that the stories that they are investigating
+require more digital security but they are struggling with switching to
+new tools. It costs a lot to change people's habit, especially with
+older journalists who are not going to change their investigation
+techniques.
+
+Their administrative staff have their Windows encrypted using BitLocker
+but the journalists on Mac are reluctant to encrypt their computer
+because it would make them slower to start.
+
+The organization is looking into switching their emails to a trusted
+provider but they are not there yet. They tried to get people to switch
+from GMail to Thunderbird but it was not adopted because people are
+really used to GMail and found Thunderbird slow in comparison,
+especially on bad Internet connections. So they tired to make people
+use OpenPGP on GMail with Mailvelope but this failed as well.
+
+The same happens with Signal, which is not as fast and reliable.
+
+But they managed to get people to use Mumble, hosted by a trusted
+provider, for their internal meetings.
+
+In general, even after learning from the recent [malware infection of
+journalists in
+Mexico](https://citizenlab.ca/2017/06/reckless-exploit-mexico-nso/).
+It's very hard for people in Latin America to know whether they have
+been infected because they lack local people who can do computer
+forensics. How can you know whether you are being spied? Not to get
+paralyzed, people stay blind to these issues and keep on doing their
+work as usual.
+
+### What they dislike
+
+- Upgrades!
+
+ Several time, their Tails stopped working because of an upgrade. In
+ such cases they would get help from another organization collaborating
+ with the whistleblowing platform which has more technical staff. Right
+ now for example, their Tails has been broken since December and is
+ being fixed by them.
+
+ One of their Tails was so old that it was impossible to upgrade it.
+ Felix installed a new Tails and copied the cryptographic key to the
+ whistleblowing platform manually.
+
+- Some months ago, they had troubles with their local keyboard
+ configuration that was not always applied.
+
+- They once lost the configuration of their persistence and struggled
+ importing their keys back to the new persistence.
+
+ When configuring Tails, some options are shown but it's hard to
+ understand what they correspond to if you are not an expert.
+
+- They have lots of trouble connecting to Tor. It can take up to 15
+ minutes and Felix tried on different networks (in the office and at
+ home).
+
+<a id="Joana"></a>
+
+Joana & Orlando, January 2018
+-----------------------------
+
+Joana and Orlando are investigative journalists and human-rights
+defenders in Latin America. They work in an organization that
+investigates and reports on private companies in Latin America, fighting
+for transparency and accountability and denouncing human-right
+violations of these companies, especially towards local communities.
+
+They use Tails for online investigation: to gather data and visit the
+websites of companies and governments. They don't redact or publish
+their reports from Tails and only use it to gather intelligence.
+
+As a policy of their organization, everybody uses Ubuntu; except Orlando
+who prefers Debian. Some staff run Windows from virtual machines for
+some applications. Another policy of their organization is to encrypt
+all emails using OpenPGP.
+
+Few organizations in Latin America are conscious and concerned about
+digital security and it's still something very new. People started being
+more cautious after learning about the [malware infections of
+journalists in
+Mexico](https://citizenlab.ca/2017/06/reckless-exploit-mexico-nso/); at
+least some journalists but not really the human-rights organizations.
+
+### Working between Tails and Ubuntu
+
+They use Tails on the laptops provided by their organization. They
+reboot into Tails to do their online work and switching is not a problem
+from them. They use an additional USB stick to save the documents that
+they want to share between Tails and their regular operating system.
+They use MAT to clean the metadata on these documents but the USB sticks
+are not encrypted. Since their Ubuntu is encrypted, they can't access it
+from Tails.
+
+### Working with local communities
+
+They often collaborate with local communities affected by the companies
+that they investigate. Joana and Orlando teach them about digital
+security, how to communicate with them, and do research online by
+themselves. Tails (and Tor) is what they recommend.
+
+But for people in the communities, Tails seems very sophisticated, too
+technical, only for spies, or too much paranoia. Joana and Orlando work
+on these stereotypes and fears but it's challenging because they don't
+have a technical background themselves. So Tails remains hard to adopt
+for most people. The communities also have little money and this doesn't
+help. Tails works better in the communities where they find a champion
+who's more interested in digital security and more into computers.
+
+### Applications they use to do their work
+
+For their investigation and reporting, they use mostly LibreOffice,
+[PSPP](http://savannah.gnu.org/projects/pspp) (statistical analysis
+tool), [QGIS](https://qgis.org/) (geographic information system),
+[Zotero](https://www.zotero.org/) (research sources organizer), GIMP,
+and Inkscape.
+
+They already have everything they need in Tails because they only use
+Tails for online investigation and data gathering and analyse the data
+on Ubuntu or Debian.
+
+For their communication they use Jitsi and Mumble (hosted by a trusted
+provider). They have Signal on their personal phones but people in the
+communities all have WhatsApp.
+
+They also have a Nextcloud hosted by a trusted provider.
+
+### Data loss and backups
+
+They don't have much in their persistence, mostly a copy of their
+OpenPGP keys (that they also have on their laptops) and some
+configuration. So it's not a big problem if they loose their persistence
+and they don't back it up.
+
+They used to have an internal backup server in their office but its
+hardware broke some months ago and it hasn't been replaced yet. For the
+time being, people usually back up their files from Ubuntu to external
+hard disks.
+
+### What they like
+
+- Cloning is very useful when working with communities.
+
+- Tails became easier to setup and configure. For example, now you can
+ install Tails from Ubuntu and Debian.
+
+- The verification to check that the ISO is genuine is still quite
+ complicated. Orlando managed to do it from the command line but without
+ really understanding. He also did it from the website and there it was
+ more automatic. He likes the command line instructions as it makes him
+ feel safer even if he only copies from the tutorial.
+
+- They really like MAT and use it a lot. Metadata and MAT are also a
+ good example to explain why you need to protect your data, your files,
+ and communications. A big limitation is that MAT cannot clean PDF
+ files which is a format that they use a lot.
+
+- They like that Tails connects automatically to Tor.
+
+- Orlando likes that Tails is based on Debian because he's been using
+ Debian himself for a while.
+
+- They really like having Thunderbird and a copy of their OpenPGP keys
+ in persistence. Before that they suffered a lot from not having access
+ to their encrypted emails when they didn't carry their work computers
+ with them. Now they can start Tails and access it anywhere, even on
+ holidays!
+
+- Tails is complicated to start on newer computer which are much more
+ locked down by companies. One time, after trying Tails on the computer
+ of a colleague, it couldn't boot Windows anymore.
+
+- They like the manuals on the website, what is Tails, how it works,
+ etc. It's good to empower people who are new to Tails.
+
+- Joana once had problems with upgrade on a USB stick. She could do the
+ first two upgrade but then it was not possible to do the third one.
+
+- Some governmental websites cannot be accessed from Tor. Orlando
+ thought that the other browser (*Unsafe Browser*?) was added to Tails
+ to make this possible.
+
<a id="Daan"></a>
Daan, December 2017
@@ -98,7 +368,7 @@ Things he likes:
Things he dislikes:
-1. He find the applications menu hard to use (but he likes GNOME).
+1. He finds the applications menu hard to use (but he likes GNOME).
2. He would like to see [tcpcrypt](http://tcpcrypt.org/) integrated
in Tails.
3. He finds the Tails user interface glossy and thinks it should
@@ -114,7 +384,7 @@ Charles is 30 years old and lives in North America. He is a political
activist working on law reform at the state level. He cares about free
software and calls himself a "purist". He is part of an organization
that provides computers and cell phones with free software
-(_libreboot_, _Replicant_) to people.
+(*libreboot*, *Replicant*) to people.
Around 2012, Bill Binney's revelations about the amount of spying done
by the US government shocked him and prompted him to re-evaluate his
@@ -125,7 +395,7 @@ Since three years, Charles uses Tails daily. He submits bug reports
and sends suggestions to the developers. He is a power-user at ease in
a terminal; he installs additional packages to adapt Tails to
his needs. He mainly uses Tails for IRC and XMPP chat, email, web
-browsing and SSH.
+browsing, and SSH.
Things he likes:
@@ -166,7 +436,7 @@ when dealing with sensitive material. Miguel identifies himself as an
intermediate level Tails user, although he helps others use Tails and
does not need other people's help himself.
-What he likes:
+### What he likes
- the new Installation Assistant
- the amnesic property, that allows him to use other people's
@@ -175,7 +445,7 @@ What he likes:
- he finds Tails easy to use, e.g. the persistence setup
- the set of bundled software
-What he does not like:
+### What he does not like
- GNOME is heavy on older computers
- the website translation workflow is hard
@@ -197,13 +467,13 @@ software to use Tor on a regular Linux distribution. Since then, Tails
is her only OS and she uses it every day; she feels very comfortable
using it, although she has not tried everything.
-What she likes:
+### What she likes
- Tails is plug'n'play and it "just works"
- Tor Browser
- MAT
-What she dislikes:
+### What she dislikes
- having to configure Tor Browser to match her security requirements
(security slider set to "High", JavaScript disabled by default)
@@ -233,13 +503,13 @@ She started using Tails herself 3 months ago. She found it easy, and
doesn't need to ask for help anymore. She uses Tails about twice
a month, mainly to upload sensitive material and for web browsing.
-What she likes:
+### What she likes
- "the bundle", i.e. everything pre-configured shipped in a box
- She found Tails very didactic and liked how she could understand how
to use it.
-What she dislikes:
+### What she dislikes
- upgrades are painful when using Tails not so often
@@ -259,7 +529,7 @@ to get started with. He advocates using Tails and started using it
himself since the coup; he uses it about once a month, primarily to
release and distribute material against the government.
-What he likes:
+### What he likes
- everything is torified by default
- the amnesic property: everything goes away when turning off the
@@ -267,7 +537,7 @@ What he likes:
- Windows Camouflage (when it was there…)
- Pidgin
-What he dislikes:
+### What he dislikes
- he had some trouble with the Unsafe Browser
@@ -286,14 +556,14 @@ He feels he knows his way around Tails and uses it once or twice
a week to browse hidden services websites and for encrypted chat
(that he finds easier to use on Tails than elsewhere).
-What he likes:
+### What he likes
- carrying a computer environment in his pocket
- OnionShare
- easy to use, practical
- how the project cares about people and security
-What he dislikes:
+### What he dislikes
- GNOME is heavy and slow on old hardware
- the end of 32-bit support
diff --git a/wiki/src/blueprint/l10n_Spanish.mdwn b/wiki/src/blueprint/l10n_Spanish.mdwn
index 006c4d0..eb17fdc 100644
--- a/wiki/src/blueprint/l10n_Spanish.mdwn
+++ b/wiki/src/blueprint/l10n_Spanish.mdwn
@@ -40,3 +40,19 @@ Se puede clonar con:
Se pueden seguir las instrucciones de
<https://tails.boum.org/contribute/how/translate/with_Git/>
+
+Traducir la interfaz como aparece
+---------------------------------
+
+Cuando en el texto se habla de botones o menús, en lugar de traducir **debemos ver cómo salen esos botones en Tails en español**.
+
+Para eso, si hemos arrancado Tails en otro idioma, podemos por ejemplo hacer
+
+ `LANG=es_ES tails-installer`
+
+Para ver el Tails Installer en español.
+
+Teclado en español
+------------------
+
+Puedes cambiarlo el teclado a español ejecutando `setxkbmap es` en la terminal
diff --git a/wiki/src/blueprint/mobile_messaging.mdwn b/wiki/src/blueprint/mobile_messaging.mdwn
index 837c760..1edc581 100644
--- a/wiki/src/blueprint/mobile_messaging.mdwn
+++ b/wiki/src/blueprint/mobile_messaging.mdwn
@@ -17,47 +17,62 @@ Corresponding ticket: [[!tails_ticket 14567]]
## Possible candidates:
-### Telegram
+### Briar
-- works over Tor (You can configure Tor as a SOCKS5 proxy in the configuration. The traffic seems to go through HTTP.)
-- is in Debian https://tracker.debian.org/pkg/telegram-desktop
-- When first starting the app, you have to enter your phone number and validate it through an SMS. Then you get all your messages and conversations back, even your stickers!
-- So it's not anonymous in the sense that it's linked with your phone number but it's super easy :)
-- instant messaging
+- decentralized
+- works over Tor
+- no Linux client yet
+
+### Matrix/Riot
+
+- [https://matrix.org/docs/projects/client/riot.html](Riot website)
+- [[!tails_ticket 15209]]
+- decentralized
+- Riot supports: IM, VoIP, Videocall & - conferencing, File Transfer (of course) and SMS
+- bridges to Slack, Gitter, IRC, Telegram, Twitter etc.
+- works over Tor
+- TLS by default
+- Debian packages, but no official ones
+
+### Ring.cx
+
+- end-to-end encrypted
+- video calls
### Signal
+- [https://signal.org](Signal website)
+- [[!tails_ticket 15200]]
- centralized server
- mass adopted
-- currently Chromium extension, will they port to FF?
-- Tor?
+- Chromium-based desktop application is deprecated, it's going to be
+ replaced by a [https://electron.atom.io/](Electron framework based)
+ standalone application, i.e. it's supposed to work in all major OS'es
+ but we don't know if such applications will actually be officially
+ available in Debian
- double ratchet
-- have to enter a phone number
- instant messaging
-
-### Matrix
-
-- decentralized
-- TLS by default
- Tor?
+- have to enter a phone number
-### Wire
+### Telegram
-- desktop client
-- but no proxy/Tor support?
-- video & audio calls
+- works over Tor (You can configure Tor as a SOCKS5 proxy in the configuration. The traffic seems to go through HTTP.)
+- [https://tracker.debian.org/pkg/telegram-desktop](is in Debian)
+- When first starting the app, you have to enter your phone number and validate it through an SMS. Then you get all your messages and conversations back, even your stickers!
+- So it's not anonymous in the sense that it's linked with your phone number but it's super easy :)
- instant messaging
-### Ring.cx
-
-- end-to-end encrypted
-- video calls
-
-### Briar
+### Wire
-- decentralized
+- [https://wire.com](Wire website)
+- desktop client
- works over Tor
-- no Linux client yet
+- video & audio calls
+- instant messaging works in Tails
+- audio calls work in Tails but firewall rules are impacted [[!tails_ticket 15196]]
+- video call untested
+- problematic: [https://motherboard.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text](Stores contacts in cleartext on server)
## Related
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 2b2695f..d1c9252 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -23,8 +23,7 @@ Discussions
[[Prepare a discussion|contribute/meetings#preparing-a-discussion]]
and add your topic here:
-* [[!tails_ticket 15135]] Self destruct password. Proposed feature without any volunteer.
-* …
+* [[!tails_ticket 15275 desc="Remove the GNOME Keyring persistent feature"]]
Roles
=====
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
index 2aa7ab2..058818f 100644
--- a/wiki/src/blueprint/monthly_report.mdwn
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -16,19 +16,6 @@ The month in the list corresponds to the month to be reported about. For
example, the report about April in the list will be written at the
beginning of May.
- - January 2017: u
- - February 2017:emmapeel
- - March 2017: intrigeri
- - April 2017: spriver
- - May 2017: u
- - June 2017: intrigeri
- - July 2017: sajolida
- - August 2017: spriver
- - September 2017: emmapeel
- - October 2017: sajolida
- - November 2017:muri
- - December 2017: muri
-
- January 2018: sajolida
- February 2018: u
- March 2018: intrigeri
@@ -42,6 +29,21 @@ beginning of May.
- November 2018: sajolida
- December 2018:
+### 2017
+
+ - January 2017: u
+ - February 2017:emmapeel
+ - March 2017: intrigeri
+ - April 2017: spriver
+ - May 2017: u
+ - June 2017: intrigeri
+ - July 2017: sajolida
+ - August 2017: spriver
+ - September 2017: emmapeel
+ - October 2017: sajolida
+ - November 2017:muri
+ - December 2017: muri
+
Checklist
=========
@@ -141,15 +143,6 @@ Template
Infrastructure
==============
- XXX: Count the number of tests in /features at the beginning of next month
-
- git checkout `git rev-list -n 1 --before="June 1" origin/devel`
- git grep --extended-regexp '^\s*Scenario:' -- features/*.feature | wc -l
-
- XXX: Report only if more scenarios have been written and add the diff from the previous month, for example:
-
- - Our test suite covers SCENARIOS scenarios, DIFF more that in May.
-
Funding
=======
@@ -180,12 +173,12 @@ Template
This page is continuously updated by tails-press@boum.org, so if
it's empty there might be nothing special to report.
- Translation
- ===========
+ Translations
+ ============
- XXX: Add the output of `contribute/l10n_tricks/language_statistics.sh`
XXX: Add the output of (adjust month!):
+ sudo apt-get install intltool
git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
git submodule update --init && \
./wiki/src/contribute/l10n_tricks/language_statistics.sh
diff --git a/wiki/src/blueprint/monthly_report/report_2018_01.mdwn b/wiki/src/blueprint/monthly_report/report_2018_01.mdwn
index 3bac0f0..8233ed0 100644
--- a/wiki/src/blueprint/monthly_report/report_2018_01.mdwn
+++ b/wiki/src/blueprint/monthly_report/report_2018_01.mdwn
@@ -6,18 +6,32 @@
Releases
========
-* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor] release).
+* [[Tails 3.4 was released on January 9|news/version_3.4]] (minor release
+ to mitigate Meltdown and Spectre).
-* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
+* [[Tails 3.5 was released on January 23|news/version_3.5]] (minor release).
-The following changes were introduced in Tails VERSION:
+* Tails 3.6 is [[scheduled for March 13|contribute/calendar]].
-XXX: Copy the "Changes" section of the release notes, and compact a bit:
+The following changes were introduced in Tails 3.5:
-* Remove lines about software upgrade (that's not Tails itself).
-* Remove screenshots.
-* Remove "New features" and "Upgrades and changes" headlines.
-* Remove line about Changelog.
+- Tor redesigned *Tor Launcher*, the application to configure a [[Tor
+ bridge|doc/first_steps/startup_options/bridge_mode]] or a local proxy.
+
+- Fix printing to a PDF in *Tor Browser*. ([[!tails_ticket 13403]]
+ and [[!tails_ticket 15024]])
+
+- Fix the opening of the **Applications** menu when the time
+ synchronization changed the clock in the past. ([[!tails_ticket 14250]])
+
+- Fix the opening of the documentation included in Tails for many
+ non-English languages. ([[!tails_ticket 15160]])
+
+- Fix translations of the time synchronization and "*Tor is ready*"
+ notifications. ([[!tails_ticket 13437]])
+
+- Remove the code to migrate from *Claws Mail* that was preventing
+ *Thunderbird* to start in some cases. ([[!tails_ticket 12734]])
Code
====
@@ -27,52 +41,81 @@ XXX: If you feel like it and developers don't do it themselves,
Release section (for example, the changes being worked on for
the next version).
-Documentation and website
-=========================
+User experience
+===============
-XXX: If you feel like it and technical writers don't do it
- themselves, explore the Git history:
+### Interviews of Tails users
- git log --patch --since='1 October' --until='1 November' origin/master -- "*.*m*"
+We published 4 new interviews:
-User experience
-===============
+- 2 from people attending 34C4: [[Daan|blueprint/interviews#Daan]] and
+ [[Charles|blueprint/interviews#Charles]].
+
+- 2 from journalists from Latin America: [[Joana & Orlando|blueprint/interviews#Joana]] and
+ [[Claudia & Felix|blueprint/interviews#Claudia]].
+
+### Additional Software
+
+We designed the interactions and interfaces for people to install
+additional software every time Tails is started.
+
+Like for [[our work on VeraCrypt in
+December|contribute/reports/SponsorW/2017_12#sprint]], we did that
+through paper prototyping and formative testing with users in Berlin.
+
+Here are the most visible parts of this upcoming feature.
+
+When installing a Debian package:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - add.png"/>
-XXX: If you feel like it and the UX team does not do it
- themselves, check the archives of tails-ux:
- <https://mailman.boum.org/pipermail/tails-ux/>
+When starting Tails with some additional packages configured:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installing.png"/>
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/notification - installed.png"/>
+
+Additional Software feature in the persistent storage configuration:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/persistent storage - configuration changed.png"/>
+
+Example list of additional software:
+
+<img src="https://raw.githubusercontent.com/sajolida/tails-wireframes/master/additional software/png/additional software.png"/>
Hot topics on our help desk
===========================
-XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
+1. Electrum users were very stressed about vulnerabilities found in January, although Tails Electrum users where not affected, as Tails does not allow the browser so much access on the computer anyway. Said users will be happy when we finally update Electrum on Tails 3.6, after Debian contributors have been hard at work this last months.
-1. Electrum, Metldown and Spectre vulnerabilities made our users restless.
+1. Meltdown, and Spectre vulnerabilities made our users restless.
-1.
+1. [[!tails_ticket 15254 desc="Tails Installer breaks in locales other
+than the default"]] This was a hard one, although on the other side we see again that many people speaks languages other than English when using Tails.
-1.
+1. [[!tails_ticket 15116 desc="NVidia Maxwell and Pascal graphic cards are still giving problems in Tails 3.5"]]
-Infrastructure
-==============
+1. As every time our Tails signing key updates, many users got scared by the gpg messages received during OpenGPG ISO verification, but there are several tickets open about this [[!tails_ticket 14711]], [[!tails_ticket 13634]], [[!tails_ticket 14977]]
-XXX: Count the number of tests in /features at the beginning of next month
+Strategic planning
+==================
- git checkout `git rev-list -n 1 --before="June 1" origin/devel`
- git grep --extended-regexp '^\s*Scenario:' -- features/*.feature | wc -l
+We published [[notes on strategic planning
+sessions|blueprint/strategic_planning]] that we had in August to
+organize future discussions.
-XXX: Report only if more scenarios have been written and add the diff from the previous month, for example:
+Infrastructure
+==============
- - Our test suite covers SCENARIOS scenarios, DIFF more that in May.
+We made plans to finish [[migrating all our download mirrors to
+HTTPS|blueprint/HTTP_mirror_pool#HTTPS]].
Funding
=======
-XXX: The fundraising team should look at the fundraising Git.
+We closed our donation campaign. XXX: Add numbers from it if possible.
- git log --patch --since='1 December' --until='1 January' origin/master
-
-XXX: The fundraising and accounting teams should look at the archives of <tails-fundraising@boum.org> and <tails-accounting@boum.org>.
+We added *I2P* in our [[list of partners|partners]]. Thank you I2P for your generous donation!
Outreach
========
@@ -82,36 +125,47 @@ Past events
Upcoming events
---------------
-XXX: Internet Freedom Festival
+
+- emmapeel and sajolida will be at the [Internet Freedom
+ Festival](https://internetfreedomfestival.org/), in Valencia from March 5 to 9.
+
+- intrigeri will be at the Tor developers meeting in Rome from March 11
+ to 15.
On-going discussions
====================
-XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
+- [Restructuring our support page](https://mailman.boum.org/pipermail/tails-project/2017-December/001030.html)
+
+Translations
+============
+
+## All the website
-Press and testimonials
-======================
+ - de: 52% (2838) strings translated, 7% strings fuzzy, 46% words translated
+ - fa: 38% (2074) strings translated, 10% strings fuzzy, 40% words translated
+ - fr: 91% (4943) strings translated, 1% strings fuzzy, 89% words translated
+ - it: 35% (1914) strings translated, 5% strings fuzzy, 31% words translated
+ - pt: 22% (1212) strings translated, 9% strings fuzzy, 19% words translated
-XXX: Copy content from press/media_appearances_2016.mdwn
- This page is continuously updated by tails-press@boum.org, so if
- it's empty there might be nothing special to report.
+Total original words: 57571
-Translation
-===========
+## [[Core pages of the website|contribute/l10n_tricks/core_po_files.txt]]
-XXX: Add the output of `contribute/l10n_tricks/language_statistics.sh`
-XXX: Add the output of (adjust month!):
+ - de: 76% (1447) strings translated, 13% strings fuzzy, 76% words translated
+ - fa: 33% (638) strings translated, 11% strings fuzzy, 33% words translated
+ - fr: 98% (1873) strings translated, 1% strings fuzzy, 99% words translated
+ - it: 70% (1336) strings translated, 14% strings fuzzy, 70% words translated
+ - pt: 41% (779) strings translated, 15% strings fuzzy, 41% words translated
- git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
- git submodule update --init && \
- ./wiki/src/contribute/l10n_tricks/language_statistics.sh
+Total original words: 17290
Metrics
=======
* Tails has been started more than BOOTS/MONTH times this month. This makes BOOTS/DAY boots a day on average.
* SIGS downloads of the OpenPGP signature of Tails ISO from our website.
-* WHISPERBACK bug reports were received through WhisperBack.
+* 107 bug reports were received through WhisperBack.
[[How do we know this?|support/faq#boot_statistics]]
diff --git a/wiki/src/blueprint/translation_platform.mdwn b/wiki/src/blueprint/translation_platform.mdwn
index 2f06630..cdf3f6e 100644
--- a/wiki/src/blueprint/translation_platform.mdwn
+++ b/wiki/src/blueprint/translation_platform.mdwn
@@ -66,7 +66,7 @@ What we plan to do is:
Repository
----------
-Currently the repo is following Tails master repo, but the changes it generates are not fed back onto Tails master automatically.
+Currently the repo is following Tails master repo, but the changes generated in translate.lizard are not fed back onto Tails master automatically.
There are several languages enabled, some of them with few or not translations.
@@ -85,3 +85,6 @@ Staging version
From this repository, a version of the website with more languages will be built [[!tails_ticket 12311]] so users can see how the file they are translating looks.
+
+
+
diff --git a/wiki/src/blueprint/usb_install_and_upgrade.mdwn b/wiki/src/blueprint/usb_install_and_upgrade.mdwn
index 2a14d34..8416d58 100644
--- a/wiki/src/blueprint/usb_install_and_upgrade.mdwn
+++ b/wiki/src/blueprint/usb_install_and_upgrade.mdwn
@@ -5,50 +5,19 @@
Roadmap
=======
-We have released something useful in Tails 0.11, based on the work we've already done on
-the basis of Fedora liveusb-creator.
+None at the moment, see:
-Next steps are:
-
-Bugfixes and minor improvements of liveusb-creator
---------------------------------------------------
-
-* Remove devices from the list when unplugged.
-* Set cursor to waiting (hourglass) state while working.
-* Allow setting the system/overlay partitions size via command-line
- option(s).
-* command-line option --local-hard-disks that would enable
- installation on local hard disks (= not external USB);
- is half-implemented by `--force`, see special casing in the
- detect_removable_devices method.
-* Should be more explicit when no target device is available:
- currently displays an empty list, no message, is not that easy to understand.
-
-### Other tasks and bugs
-
-See the [Installer tickets on Redmine](https://labs.riseup.net/code/projects/tails/issues?query_id=120).
-
-Incremental upgrades
---------------------
-
-See the dedicated page about [[todo/incremental_upgrades]].
-
-Choose again
-------------
-
-Implement our [[specifications|future_spec]] in (probably) Ubuntu's
-[usb-creator](https://launchpad.net/usb-creator), that has a much
-saner codebase.
-
-This should also open the possibility to take care of, at least, verified
-downloads and Windows support.
+* as a starting point: [[!tails_ticket 11679]]
+* regarding improving upgrades: [[!tails_ticket 11131]],
+ [[!tails_ticket 15277]] and their blueprint
+* regarding shipping a disk image that can be dd'ed to a USB stick and
+ produce a _final Tails_, see
+ [[usb_install_and_upgrade/usb_bootable_disk_image]]
Resources
=========
+* [[notes about UEFI|UEFI]]
* [[notes about GPT|usb_install_and_upgrade/gpt]]
-* the **code**: our work on liveusb-creator is in a [[dedicated Git
- repository|contribute/git]]. Integration work is made in the
- `feature/usb_installer` branch in the main Tails Git repository.
* USB installation [[specification and design|contribute/design/installation]]
-* archived [[roundup of existing tools|todo/usb_install_and_upgrade/archive]]
+* archived [[roundup of existing tools|usb_install_and_upgrade/archive]]
diff --git a/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn b/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn
new file mode 100644
index 0000000..718ce6b
--- /dev/null
+++ b/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn
@@ -0,0 +1,142 @@
+[[!meta title="Bootable USB disk image"]]
+
+[[!toc levels=2]]
+
+# Motivation
+
+This is about generating, distributing and installing Tails as a disk
+image that, once copied bit-by-bit to a USB stick, produces a _final
+Tails_ (GPT, UEFI-bootable, ready to get a persistent volume).
+
+This would:
+
+ - avoid the need for a second USB stick and an intermediary Tails
+ during the initial installation and full manual upgrade; as
+ a consequence:
+ - big UX win
+ - avoid the
+ [[!tails_ticket 12146 desc="intermediary Tails not being bootable on many UEFI systems"]]
+ problem
+ - removes a blocker for
+ [[!tails_ticket 6560 desc="Secure Boot support"]] (a non-GPT
+ intermediary Tails would never work with Secure Boot enabled)
+ - allow us to use simpler, more reliable installers at least on
+ Windows and macOS and then:
+ - avoids user confusion that results in creating a non-bootable
+ device e.g. [[!tails_ticket 13206]]
+ - relying on third-party tools becomes less painful
+ - pave the way to a self-extracting file offered for download,
+ that would bundle the disk image, the program used to copy it to
+ the target device, and some wrapper that would run that program
+ with the right arguments
+
+# Generating
+
+`live-build` can generate `hdd` images. Alternatively, we can
+post-process our ISO image to create a USB-bootable disk image.
+
+Open questions:
+
+ - What size should the system partition be? Do we grow the system
+ partition on first boot (from the initramfs) e.g.
+ with [[!debpts cloud-init]] or the Rasbian tools
+ (<https://www.raspberrypi.org/downloads/noobs/>,
+ <https://www.raspberrypi.org/downloads/raspbian/>)?
+ - What about DVD support? Can we stop distributing an ISO image
+ some day?
+
+# Distributing
+
+XXX: impact on mirrors' storage space?
+
+# Installing
+
+## from Windows
+
+### Etcher
+
+See below "from macOS".
+
+<a id="rufus"></a>
+
+### Rufus
+
+- [homepage](https://rufus.akeo.ie)
+- CLI mode: [in progress](https://github.com/pbatard/rufus/issues/111) but not on priority list of the developer
+- Complicated UX
+ - too many options
+ - need to download supplementary files for syslinux version
+ - not clear which partition scheme to use even though it selects one
+ automatically
+ - user has to manually choose to install our ISOhybrided image either using
+ ISO or DD mode.
+- License: GnuGPL
+- [[!tails_ticket 10984]]: Boots (tested in legacy mode)
+ - When burnt in "DD" mode, the checksums match!
+- [Recommended by Ubuntu for Windows](https://tutorials.ubuntu.com/tutorial/tutorial-create-a-usb-stick-on-windows#1)
+
+<img src="https://rufus.akeo.ie/pics/rufus_en.png"/>
+
+<a id="win32-disk-imager"></a>
+
+### Win32 Disk Imager
+
+[[!tails_ticket 14447]]
+
+- Homepage: <https://sourceforge.net/projects/win32diskimager/>
+- License: GPL
+- Tested version: 1.0 from 2017-03-07
+- Work on: Windows 7+
+- UI is quite simple.
+- Requires proper installing, clicking on the .exe is not enough (unlike
+ UUI).
+- Doesn't have a filter for ISO images in its file chooser (but I could
+ choose to see all files and select an ISO image).
+- Takes 30 minutes to do the copy.
+- Checksum of the resulting USB stick matches the checksum of the ISO image.
+
+<img src="https://labs.riseup.net/code/attachments/download/1885/Win32%20Disk%20Imager.png"/>
+
+## from macOS
+
+<a id="etcher"></a>
+
+### Etcher
+
+ - Tested version: 1.3.1 from 2018-01-23
+ - [homepage](https://etcher.io)
+ - Windows, macOS, Linux (deb & rpm)
+ - no official Debian images
+ - CLI mode: [Etcher CLI](https://etcher.io/cli/) is experimental, it's a
+ different executable than the GUI one, so we can suppose that it can't be run
+ to launch the GUI with the right options.
+ - License: Apache
+ - [[!tails_ticket 11348]]: images created with Etcher boot (in legacy mode at least) and checksums match
+ - [It is recommended by Ubuntu for macOS](https://tutorials.ubuntu.com/tutorial/tutorial-create-a-usb-stick-on-macos#3)
+ - Requires macOS 10.9 (Mavericks) or newer
+ ([which means a Mac from ~2007-2009 or newer](https://support.apple.com/kb/SP702?locale=en_US))
+ - Takes 5 minutes to do the copy.
+ - Has both a portable and installable version for Windows
+
+<img src="https://etcher.io/static/screenshot.gif"/>
+
+<a id="macos-disk-utility"></a>
+
+### macOS Disk Utility
+
+- Tested version: Mac OS X Lion
+- I get an error ("invalid source") when I try to either:
+ - Copy a Tails 3.5 ISO image onto a USB stick.
+ - Restore the disk image of a full USB stick installed using @dd@.
+ - Restart the disk image of the system partition of a USB stick installed using @dd@.
+
+## from Linux
+
+_GNOME Disks_ has a _Restore Disk Image_ feature that basically does
+`dd` with a nice progress bar.
+
+# Upgrading
+
+This approach does not make full, manual upgrades any simpler. For the
+ideas we have to fix that other problem, see [[!tails_ticket 11131]]
+and [[blueprint/Endless_upgrades]].
diff --git a/wiki/src/blueprint/veracrypt.mdwn b/wiki/src/blueprint/veracrypt.mdwn
index 35e5024..e368b65 100644
--- a/wiki/src/blueprint/veracrypt.mdwn
+++ b/wiki/src/blueprint/veracrypt.mdwn
@@ -428,7 +428,7 @@ preliminary research work on user needs and technical feasibility.
We will implement and upstream each iteration one after the other and go
as far as the budget allows.
-1. Unlocking partitions
+1. Unlocking partitions ([[!tails_ticket 15214]])
-----------------------
This iteration is the bare minimum for this project but also the
@@ -448,7 +448,7 @@ covers:
will also be very cheap to add to the custom dialogs that we will
already have to implement for the opening of hidden volumes.
-2. Unlocking file containers
+2. Unlocking file containers ([[!tails_ticket 15223]])
----------------------------
This iteration extends the work done on the unlocking of partitions to
@@ -470,10 +470,14 @@ integration code:
- GNOME Files cannot automatically identify and flag file containers as
such.
+- The integration in the sidebar of GNOME Files of opened file
+ containers will require to patch the GTK library which was not
+ expected initially.
+
- Displaying the file name of the containers when unlocking it through
GVfs will require an additional patch upstream.
-3. Creating and modifying partitions and containers
+3. Creating and modifying partitions and containers ([[!tails_ticket 15227]])
---------------------------------------------------
Since our main objective for integrating better VeraCrypt in Tails is to
@@ -492,7 +496,7 @@ This iteration covers:
- The modification of existing volumes, which will be very similar to
the creation of new volumes.
-4. *VeraCrypt Mounter*
+4. *VeraCrypt Mounter* ([[!tails_ticket 15043]])
----------------------
*VeraCrypt Mounter* is a very simple application wrapper that we
@@ -532,3 +536,41 @@ User interface
### *VeraCrypt Mounter* (optional)
<img src="https://labs.riseup.net/code/attachments/download/1842/veracrypt-mounter.png">
+
+
+Detecting VeraCrypt volumes
+===========================
+
+In contrast to LUKS, VeraCrypt and TrueCrypt volumes do not have a cleartext header, but are completely encrypted (see the [VeraCrypt Volume Format Specification][]). As a result, VeraCrypt/TrueCrypt volumes cannot be distinguished from random data. This means that the best we can do is to indicate to the user that a partition / file seems to be encrypted or random data, and therefore is a candidate for being a VeraCrypt/TrueCrypt volume.
+
+To determine whether data seems to be encrypted or random, we use [Pearson's chi-squared test][]. This test is often used to test for randomness.
+
+When trying to determine whether a *partition* (or whole device) is a VeraCrypt/TrueCrypt volume, we don't want to read more than necessary, to avoid slowing things down too much. Because non-encrypted filesystems usually start with a header, which is very non-random, we only perform the chi-squared test on these first 512 Bytes.
+
+The chi-squared test requires a p-value, for which to reject the hypothesis that the data is random. We choose 1/10.000.000.000 as the p-value, which means that in one of 10 billion cases, the test will issue a false negative, i.e. that the data is non-random/non-encrypted even though it actually is random/encrypted. Using the [scipy chi2 module][], we derive the following upper and lower limits for the From this p-value, we get the follwing lower and upper limits for the chi-squared value:
+
+ >>> from scipy.stats import chi2
+ >>> chi2.ppf([0.1**10, 1-0.1**10], 255)
+ array([ 136.49878495, 425.92327131])
+
+We round these values to the closest integer. So for chi-squared values between 136 and 426, we accept the hypothesis that the data is random/encrypted.
+
+We will not be able to prevent false positives as effectively as false negatives. Since we treat all random-looking partitions as TrueCrypt/VeraCrypt candidates, we will definitely have false positives, because there are other use cases for random looking partitions, for example plain dm-crypt, headerless LUKS, or LoopAES partitions. This cannot be avoided, therefore we have to clearly indicate to the user that a partition is not definitely a TrueCrypt/VeraCrypt partition, but only a candidate.
+
+We don't expect false positives for unencrypted filesystems, because the chi-squared value clearly indicates that they are not encrypted. Some examples for chi-squared values of (more or less) common filesystems, calculated with the above method:
+
+| Filesystem | Chi-squared |
+|------------|-------------|
+| bfs | 113013 |
+| exfat | 115672 |
+| ext2 | 130560 |
+| ext3 | 130560 |
+| ext4 | 130560 |
+| fat | 56629 |
+| minix | 130560 |
+| ntfs | 61937 |
+| vfat | 56651 |
+
+ [VeraCrypt Volume Format Specification]: https://veracrypt.codeplex.com/wikipage?title=VeraCrypt%20Volume%20Format%20Specification
+ [Pearson's chi-squared test]: https://en.wikipedia.org/wiki/Chi-squared_test
+ [scipy chi2 module]: https://docs.scipy.org/doc/scipy/reference/generated/scipy.stats.chi2.html
diff --git a/wiki/src/blueprint/what_tails_is.mdwn b/wiki/src/blueprint/what_tails_is.mdwn
index e69de29..10db1b6 100644
--- a/wiki/src/blueprint/what_tails_is.mdwn
+++ b/wiki/src/blueprint/what_tails_is.mdwn
@@ -0,0 +1,3 @@
+- Additional Software P1 talking about how everything we do on the
+ Internet is tracked: "With Tails I can create that image for myself".
+- Additional Software P4: "bullet proof".
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index 007a074..cf2cf61 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-12-22 08:59+0100\n"
+"POT-Creation-Date: 2018-02-04 12:41+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"
@@ -630,6 +630,11 @@ msgid ""
msgstr "[[Treffen|contribute/meetings]] und Protokolle vergangener Treffen"
#. type: Bullet: ' - '
+msgid ""
+"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
+msgstr ""
+
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "[[Marking a task as easy|contribute/working_together/"
@@ -658,6 +663,9 @@ msgid ""
" - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+" - Sponsor deliverables:\n"
+" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
+" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index 36d28ca..e541296 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2017-12-22 08:59+0100\n"
+"POT-Creation-Date: 2018-02-04 12:41+0100\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -613,6 +613,11 @@ msgid ""
msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
#. type: Bullet: ' - '
+msgid ""
+"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
+msgstr ""
+
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "[[Marking a task as easy|contribute/working_together/"
@@ -640,6 +645,9 @@ msgid ""
" - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+" - Sponsor deliverables:\n"
+" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
+" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index 4cf53ca..6b6e091 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-12-22 08:59+0100\n"
+"POT-Creation-Date: 2018-02-04 12:41+0100\n"
"PO-Revision-Date: 2017-10-08 20:34+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -597,6 +597,11 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
+"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
"[[Marking a task as Starter|contribute/working_together/"
"criteria_for_starter_tasks]]"
msgstr ""
@@ -608,12 +613,27 @@ msgid "[[Document progress|contribute/working_together/document_progress]]"
msgstr "[[Document progress|contribute/working_together/document_progress]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - Roles\n"
+#| " - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
+#| " - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
+#| " - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+#| " - [[Release manager|contribute/working_together/roles/release_manager]]\n"
+#| " - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
+#| " - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
+#| " - [[Technical writer|contribute/working_together/roles/technical_writer]]\n"
+#| " - [[Test suite maintainers|contribute/working_together/roles/test_suite]]\n"
+#| " - [[UX designer|contribute/working_together/roles/ux]]\n"
+#| " - [[Reports sent to sponsors|contribute/reports]]\n"
msgid ""
" - Roles\n"
" - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+" - Sponsor deliverables:\n"
+" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
+" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
diff --git a/wiki/src/contribute.it.po b/wiki/src/contribute.it.po
index 5fa4a37..29441e1 100644
--- a/wiki/src/contribute.it.po
+++ b/wiki/src/contribute.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-12-22 08:59+0100\n"
+"POT-Creation-Date: 2018-02-04 12:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -485,6 +485,11 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
+"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
"[[Marking a task as Starter|contribute/working_together/"
"criteria_for_starter_tasks]]"
msgstr ""
@@ -500,6 +505,9 @@ msgid ""
" - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+" - Sponsor deliverables:\n"
+" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
+" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index 0217f85..845f33f 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -204,12 +204,16 @@ Collective process
- [[Code of conduct|contribute/working_together/code_of_conduct]]
- [[Social contract|contribute/working_together/social_contract]]
- [[Contributors meetings|contribute/meetings]], and minutes from past meetings
+ - [[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]
- [[Marking a task as Starter|contribute/working_together/criteria_for_starter_tasks]]
- [[Document progress|contribute/working_together/document_progress]]
- Roles
- [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]
- [[Foundations team|contribute/working_together/roles/foundations_team]]
- [[Help desk|contribute/working_together/roles/help_desk]]
+ - Sponsor deliverables:
+ - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]
+ - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]
- [[Release manager|contribute/working_together/roles/release_manager]]
- [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]
- [[Sysadmins|contribute/working_together/roles/sysadmins]]
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 33429e4..7599abf 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-12-22 08:59+0100\n"
+"POT-Creation-Date: 2018-02-04 12:41+0100\n"
"PO-Revision-Date: 2016-04-30 11:31-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -616,6 +616,11 @@ msgstr ""
"passadas"
#. type: Bullet: ' - '
+msgid ""
+"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
+msgstr ""
+
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "[[Marking a task as easy|contribute/working_together/"
@@ -648,6 +653,9 @@ msgid ""
" - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
+" - Sponsor deliverables:\n"
+" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
+" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 4255214..aa1b22d 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,20 +1,36 @@
[[!meta title="Calendar"]]
-* 2018-01-12, 16:00 (Berlin time): VeraCrypt team meeting
-
-* 2018-01-23: Release 3.5 (Firefox 52.6, bugfix release) — anonym is the RM
-
-* 2018-01-25, 16:00 (Berlin time): VeraCrypt team meeting
-
* 2018-02-01, 16:00 (Berlin time): CI team meeting
* 2018-02-05, 14:00 (Berlin time): Additional Software team meeting
* 2018-02-26, 16:00 (Berlin time): VeraCrypt team meeting
+* 2018-03-01:
+ - Feature Freeze: All feature branches targeting Tails 3.6 should
+ be merged into the `devel` branch by noon, CET. I'm open to make
+ exceptions if you can be online and responsive during that
+ afternoon, but ask me first!
+ - Build and upload Tails 3.6~rc1.
+ - Start testing Tails 3.6~rc1 during late CET if building the image
+ went smoothly.
+
+* 2018-03-02:
+ - Finish testing Tails 3.6~rc1 by the afternoon, CET.
+ - Release Tails 3.6~rc1.
+
* 2018-03-05, 14:00 (Berlin time): Additional Software team meeting
-* 2018-03-13: Release 3.6 (Firefox 52.7, major release) — bertagaz is the RM
+* 2018-03-12:
+ - All branches targeting Tails 3.6 *must* be merged into the
+ `testing` branch by noon, CET.
+ - The upcoming Tor Browser is hopefully out so we can import it.
+ - Build and upload Tails 3.6 ISO image and IUKs.
+ - Hopefully start testing Tails 3.6.
+
+* 2018-03-13:
+ - Finish testing Tails 3.6 by the afternoon, CET.
+ - Release Tails 3.6 during late CET.
* 2018-03-23, 16:00 (Berlin time): VeraCrypt team meeting
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 71f0119..8a323ed 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -829,7 +829,7 @@ for remapped hidden services) and as a DNS server on port 8853.
The client listens on a few SOCKS ports (the rationale being detailed
on the [[Tor stream isolation design
-page|contribute/design/stream_isolation]]): 9050, 9061, 9062 and 9151.
+page|contribute/design/stream_isolation]]): 9050, 9061, 9062 and 9150.
Only connections from localhost are accepted. It can be argued
that running a Tor server (onion router) would increase one's
diff --git a/wiki/src/contribute/how/documentation/style_guide.mdwn b/wiki/src/contribute/how/documentation/style_guide.mdwn
index a6361cf..1f710f9 100644
--- a/wiki/src/contribute/how/documentation/style_guide.mdwn
+++ b/wiki/src/contribute/how/documentation/style_guide.mdwn
@@ -1,3 +1,8 @@
+- Bulleted lists
+
+ Refer to this article from NN/g on [presenting bulleted
+ lists](https://www.nngroup.com/articles/presenting-bulleted-lists/).
+
- *Debian and Ubuntu version*
Refer to Debian versions primarily by their number, and additionally
diff --git a/wiki/src/contribute/l10n_tricks/language_statistics.sh b/wiki/src/contribute/l10n_tricks/language_statistics.sh
index 8fcc580..35e5ce0 100755
--- a/wiki/src/contribute/l10n_tricks/language_statistics.sh
+++ b/wiki/src/contribute/l10n_tricks/language_statistics.sh
@@ -38,7 +38,7 @@ statistics () {
intltool_report () {
rm -rf tmp/pot
- ./refresh-translations
+ ./refresh-translations --keep-tmp-pot
rm -rf po.orig
cp -a po po.orig
(
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index c8dac98..70397e5 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -793,17 +793,6 @@ If preparing a RC, skip this part.
Update the ISO description file (IDF) used by the browser extension:
- cat > "${RELEASE_CHECKOUT:?}"/wiki/src/install/v1/Tails/i386/stable/latest.yml <<EOF
- ---
- build-target: amd64
- channel: stable
- product-name: Tails
- version: '${VERSION:?}'
- target-files:
- - sha256: ${ISO_SHA256SUM}
- size: ${ISO_SIZE_IN_BYTES:?}
- url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso
- EOF
cat > "${RELEASE_CHECKOUT:?}"/wiki/src/install/v1/Tails/amd64/stable/latest.yml <<EOF
---
build-target: amd64
@@ -816,7 +805,7 @@ Update the ISO description file (IDF) used by the browser extension:
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso
EOF
( cd "${RELEASE_CHECKOUT:?}" && \
- git add wiki/src/install/v1/Tails/{i386,amd64}/stable/latest.yml && \
+ git add wiki/src/install/v1/Tails/amd64/stable/latest.yml && \
git commit -m "Update IDF file for Tails Verification." )
Upload images
@@ -1305,12 +1294,8 @@ Push
### Git
-If preparing a release candidate, just push the `master` branch:
-
- git push origin master:master
-
If preparing an actual release, push the last commits to our Git
-repository like this:
+repository and put `master` in the following state:
( cd "${RELEASE_CHECKOUT:?}" && \
git push origin \
@@ -1319,10 +1304,26 @@ repository like this:
) && \
( cd "${MASTER_CHECKOUT:?}" && \
git fetch && \
- git merge "origin/${WEBSITE_RELEASE_BRANCH:?}" && \
+ git merge "origin/${WEBSITE_RELEASE_BRANCH:?}" \
+ )
+
+Then (or if you preparing a release candidate) ensure that `master`
+has `stable` as its base branch:
+
+ ( cd "${MASTER_CHECKOUT:?}" && \
+ echo "stable" > config/base_branch && \
+ git commit config/base_branch \
+ -m "Restore master's base branch." \
+ )
+
+Finally, push the `master` branch to make the changes go live on our
+website:
+
+ ( cd "${MASTER_CHECKOUT:?}" && \
git push origin master:master \
)
+The release is now public! Woo!
Bug tracker
-----------
diff --git a/wiki/src/contribute/release_process/tails-iuk.mdwn b/wiki/src/contribute/release_process/tails-iuk.mdwn
index 231998c..3ba5bc7 100644
--- a/wiki/src/contribute/release_process/tails-iuk.mdwn
+++ b/wiki/src/contribute/release_process/tails-iuk.mdwn
@@ -77,7 +77,11 @@ Run the upstream test suite:
umask 077
# Run the test suite
- RELEASE_TESTING=1 LC_ALL=C dzil test
+ NODE_PATH="/path/to/tails.git/submodules/mirror-pool-dispatcher/lib/js" \
+ PATH="/path/to/tails.git/submodules/mirror-pool-dispatcher/bin:$PATH" \
+ RELEASE_TESTING=1 \
+ LC_ALL=C \
+ dzil test
Build an upstream tarball, tag the release, move the tarball out of
the build repository and cleanup:
diff --git a/wiki/src/contribute/reports/SponsorW/2017_12.mdwn b/wiki/src/contribute/reports/SponsorW/2017_12.mdwn
index c48389a..4060617 100644
--- a/wiki/src/contribute/reports/SponsorW/2017_12.mdwn
+++ b/wiki/src/contribute/reports/SponsorW/2017_12.mdwn
@@ -50,6 +50,8 @@ Definition of the scope of our work:
- 55% of Tails+VeraCrypt users have legacy TrueCrypt volumes.
- 42% of Tails+VeraCrypt users use keyfiles.
+<a id="sprint"></a>
+
## A.2 UX & UI design sprint
The main developer and the UX designer working on this project gathered for
diff --git a/wiki/src/contribute/sponsorship_to_attend_events.mdwn b/wiki/src/contribute/sponsorship_to_attend_events.mdwn
new file mode 100644
index 0000000..fe73272
--- /dev/null
+++ b/wiki/src/contribute/sponsorship_to_attend_events.mdwn
@@ -0,0 +1,112 @@
+[[!meta title="Sponsorship to attend events on behalf of Tails"]]
+
+In general, you should not have to spend your own money to attend
+relevant events such as conferences on behalf of Tails: in most cases
+the project will reimburse the corresponding expenses. Here is how to
+get such sponsorship.
+
+[[!toc levels=2]]
+
+# General rules
+
+## Can I request sponsorship?
+
+If you're reading this page and wondering whether you can request
+sponsorship, then you probably can; e.g. If you've spent more than
+20 hours working on Tails this year, be it as a volunteer or as a paid
+worker, then you definitely qualify :)
+
+## What kind of costs are covered?
+
+This sponsorship can cover your travel costs, food, hydration, local
+transportation, and conference tickets.
+
+When spending Tails' money, keep in mind that the project is working
+with a limited budget that is to be used with frugality.
+
+## Is it OK to request sponsorship after the fact?
+
+No, it's not OK. In order to avoid biasing the decision-making process,
+sponsorship should be asked before spending the corresponding money, and
+thus before the event.
+
+See below for specific deadlines.
+
+## What should I write in my sponsorship request?
+
+Sponsorship requests must include:
+
+ - A detailed estimated budget of travel costs, hosting, food, and other
+ expenses.
+
+ - A list of objectives for the event; in other words, what do you plan
+ to do there, and why will it be beneficial for Tails.
+
+ Take it easy though, we're not asking for a detailed work plan: for
+ example, "getting to know many other Tails people in person" is
+ often a valid objective.
+
+## Who should I write to?
+
+Send your sponsorship request to the <tails@boum.org> private mailing
+list: [[about/contact#tails]].
+
+## There must be a trap, what I am committing to exactly?
+
+After the event, you will have to send a report about the event to the
+relevant mailing list.
+
+Most of the time the public <tails-project@boum.org> list is the best
+place to report to, but you may also have additional bits to report
+privately, for example to the Fundraising team if you found funding
+leads.
+
+## How do I get actually reimbursed?
+
+The process to get your expenses reimbursed is not documented yet,
+stay tuned. Meanwhile:
+
+ - While spending money on behalf of Tails, keep the original proofs
+ (e.g. paper receipts) of all the expenses you want Tails
+ to reimburse.
+
+ - Reimbursements are processed by our accounting team:
+ [[about/contact#tails-accounting]].
+
+# Decision-making process
+
+1. If you're requesting an amount below 400€, then you can use your
+ _Magical Joker_. This only works once per year. If you choose to do
+ so, then make it clear in your sponsorship request.
+
+2. Send your sponsorship request as documented above.
+
+3. If you used your _Magical Joker_, then your sponsorship request
+ will be implicitly approved a week after you have sent it…
+ unless <tails@boum.org> says otherwise.
+
+ Else, if you are not using your _Magical Joker_, then wait for
+ an answer.
+
+# Special cases
+
+## Highly popular events
+
+Events that many Tails contributors will probably want to attend, for
+example the Chaos Communication Congress, are handled in a specific
+manner: we want to avoid any "first come first serve" unfairness, and
+instead make a decision with a good overview of how many people want to
+attend.
+
+Sponsorship requests for such events are not handled individually, one
+after the other. Instead, two months before the events starts,
+<tails@boum.org> looks at all the sponsorship requests received about
+this event, makes a decision, and answers everyone at once.
+
+Sponsorship requests received later are still considered but they have
+less chances to be accepted.
+
+The _Magical Joker_ does not work for highly popular events.
+
+Events that have been highly popular in the past include: Chaos
+Communication Congress, DebConf, Internet Freedom Festival, FOSDEM.
diff --git a/wiki/src/contribute/working_together/roles/sponsor_deliverables/team_manager.mdwn b/wiki/src/contribute/working_together/roles/sponsor_deliverables/team_manager.mdwn
new file mode 100644
index 0000000..0311291
--- /dev/null
+++ b/wiki/src/contribute/working_together/roles/sponsor_deliverables/team_manager.mdwn
@@ -0,0 +1,23 @@
+[[!meta title="Team Manager for sponsor deliverables"]]
+
+As the manager for a team that works on a deliverable we've promised
+to a sponsor, you must:
+
+- Ask any information you lack to the Fundraising Team.
+
+- Ensure that the workers on your team are aware of
+ [[what they are responsible for|sponsor_deliverables/worker]] in
+ terms of self-management… and actually do it. Help them as needed in
+ whatever way you see fit, e.g. organize meetings.
+
+- Check status of work vs. deadlines.
+
+ Try to foresee upcoming problems. If you notice or foresee any
+ problem, ensure the team is aware of the problem, and help them plan
+ how to solve it (e.g. reassign to someone else or adjust the
+ timeline and tell the sponsor about it as soon as possible).
+
+- Report on status of work vs. deadlines to the Fundraising Team.
+
+ They will relay this information to the sponsor and to the
+ Accounting Team that handles invoicing.
diff --git a/wiki/src/contribute/working_together/roles/sponsor_deliverables/worker.mdwn b/wiki/src/contribute/working_together/roles/sponsor_deliverables/worker.mdwn
new file mode 100644
index 0000000..cb344df
--- /dev/null
+++ b/wiki/src/contribute/working_together/roles/sponsor_deliverables/worker.mdwn
@@ -0,0 +1,43 @@
+[[!meta title="Worker for sponsor deliverables"]]
+
+As a worker paid to do work on a deliverable we've promised to
+a sponsor, you must:
+
+- Ask any information you lack to your
+ [[sponsor_deliverables/team_manager]].
+
+- Track which ticket corresponds to which deliverable.
+
+ Ensure each of your deliverables has a ticket in Redmine with the
+ correct _Deliverable for_ value.
+
+- Schedule your work in advance to meet deadlines:
+
+ - Plan for surprises such as tasks that are unexpectedly harder
+ than planned.
+ - Use the _Target version_ field in Redmine to track your own plans
+ and timing goals. Keep this information up-to-date at all times.
+
+- Check how good you're doing wrt. their deliverables and deadlines.
+ Talk to your [[sponsor_deliverables/team_manager]] as soon as you
+ can if any problem arises.
+
+- Report your progress on deliverables when requested.
+
+ Summarize the tickets and achievements of each deliverables since
+ the last report. This information will then be transmitted to the
+ Accounting Team for invoicing. Clarify the matching between tickets
+ and deliverables; for example, you can report:
+
+ - "B.3.7 completed: #nnnn, #mmmm, etc.": all these tickets must
+ have the _Resolved_ or _Fix committed_ status in Redmine.
+ - "C.4.2 (#nnnn, #mmmm) in progress but not completed because of
+ $reasons".
+
+- When reporting, if you want to adjust the way the money for a given
+ task is split within your team, then specify it. For example if you
+ delegated one of your task to someone else and want to give them your
+ money, then specify this. If you want to split your money with
+ someone else, then specify this as well. Remember that we are taking
+ as a reference for payment the time estimate that we agreed upon
+ while preparing the grant and won't pay more.
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index 574b457..42beaba 100644
--- a/wiki/src/doc/first_steps/startup_options.fr.po
+++ b/wiki/src/doc/first_steps/startup_options.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-01-23 18:26+0100\n"
-"PO-Revision-Date: 2018-01-12 17:52+0000\n"
+"PO-Revision-Date: 2018-01-24 17:42+0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -151,10 +151,9 @@ msgstr ""
"<span class=\"application\">bureau GNOME</span> :\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img tails-greeter-welcome-to-tails.png link=no alt=\"Welcome to Tails!\"]]\n"
+#, no-wrap
msgid "[[!img tails-greeter-welcome-to-tails.png link=no alt=\"Tails Greeter: Welcome to Tails!\"]]\n"
-msgstr "[[!img tails-greeter-welcome-to-tails.png link=no alt=\"Bienvenue dans Tails !\"]]\n"
+msgstr "[[!img tails-greeter-welcome-to-tails.png link=no alt=\"Tails Greeter : Bienvenue dans Tails !\"]]\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.de.po b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
index 567fbbb..acc6457 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.de.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2016-07-17 04:40+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translators <tails-l10n@boum.org>\n"
@@ -97,6 +97,11 @@ msgstr ""
"die <span class=\"button\">Ja</span>-Schaltfläche aus. Anschließend klicken "
"Sie bitte auf <span class=\"button\">Anmelden</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.fa.po b/wiki/src/doc/first_steps/startup_options/administration_password.fa.po
index e5f9ea7..21bf54a 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.fa.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2015-09-30 14:18+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -98,6 +98,11 @@ msgstr ""
"\"button\">بله</span> کلیک کنید. سپس روی <span class=\"button\">ادامه</span> "
"کلیک کنید."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
index be67bda..f957fc4 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
-"PO-Revision-Date: 2016-03-26 22:04+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
+"PO-Revision-Date: 2018-01-24 17:40+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -76,44 +76,38 @@ msgstr ""
"Greeter</span>|startup_options#tails_greeter]].\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "When <span class=\"application\">Tails Greeter</span> appears, in the "
-#| "<span class=\"guilabel\">Welcome to Tails</span> window, click on the "
-#| "<span class=\"button\">Yes</span> button. Then click on the <span class="
-#| "\"button\">Forward</span> button."
msgid ""
"When <span class=\"application\">Tails Greeter</span> appears, click on the "
"<span class=\"button\">[[!img lib/list-add.png alt=\"Expand\" class="
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
-"Lorsque <span class=\"application\">Tails Greeter</span> apparaît, dans la "
-"fenêtre <span class=\"guilabel\">Bienvenue dans Tails</span>, cliquez sur le "
-"bouton <span class=\"button\">Oui</span>. Puis cliquez sur le bouton <span "
-"class=\"button\">Suivant</span>."
+"Lorsque <span class=\"application\">Tails Greeter</span> apparaît, cliquez "
+"sur le bouton <span class=\"button\">[[!img lib/list-add.png alt=\"Étendre\" "
+"class=\"symbolic\" link=\"no\"]]</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
"click on <span class=\"guilabel\">Administration Password</span>."
msgstr ""
+"Lorsque la fenêtre <span class=\"guilabel\">Paramètres supplémentaires</"
+"span> apparaît, cliquez sur <span class=\"guilabel\">Mot de passe "
+"d'administration</span>."
#. type: Bullet: '3. '
-#, fuzzy
-#| msgid ""
-#| "In the <span class=\"guilabel\">Administration password</span> section, "
-#| "specify a password of your choice in both the <span class=\"guilabel"
-#| "\">Password</span> and <span class=\"guilabel\">Verify Password</span> "
-#| "text boxes."
msgid ""
"Specify a password of your choice in both the <span class=\"guilabel"
"\">Administration Password</span> and <span class=\"guilabel\">Confirm</"
"span> text boxes then click <span class=\"button\">Add</span>."
msgstr ""
-"Dans la partie <span class=\"guilabel\">Mot de passe d'administration</"
-"span>, saisissez un mot de passe de votre choix dans les deux champs <span "
-"class=\"guilabel\">Mot de passe</span> et <span class=\"guilabel"
-"\">Vérification du mot de passe</span>."
+"Saisissez un mot de passe de votre choix dans les zones de texte <span class="
+"\"guilabel\">Mot de passe d'administration</span> et <span class=\"guilabel"
+"\">Confirmer</span> puis cliquez sur <span class=\"button\">Ajouter</span>."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.it.po b/wiki/src/doc/first_steps/startup_options/administration_password.it.po
index 858800b..d01cce5 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.it.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.it.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Italiano\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2016-05-17 09:30+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -92,6 +92,11 @@ msgstr ""
"pulsante <span class=\"button\">Sì</span>. Poi clicca sul pulsante\n"
"<span class=\"button\">Avanti</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
index c883b16..265747c 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
@@ -23,6 +23,8 @@ Greeter</span>|startup_options#tails_greeter]].
1. When <span class="application">Tails Greeter</span> appears, click on the
<span class="button">[[!img lib/list-add.png alt="Expand" class="symbolic" link="no"]]</span> button.
+ [[!img additional.png link="no" alt="Additional settings of Tails Greeter"]]
+
2. When the <span class="guilabel">Additional Settings</span> dialog appears,
click on <span class="guilabel">Administration Password</span>.
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.pt.po b/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
index 503c589..e5a1569 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2014-06-21 19:15-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,6 +92,11 @@ msgstr ""
"<span class=\"button\">Sim</span>. Em seguida clique no botão <span class="
"\"button\">Próximo</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
index be502fb..b7c3eff 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,11 @@ msgstr ""
"<span class=\"button\">Ja</span>. Anschließend klicken Sie bitte auf <span "
"class=\"button\">Weiter</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fa.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fa.po
index 935321a..8cb2e2d 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fa.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,6 +23,11 @@ msgid ""
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po
index 7e7b33a..a0ad7ff 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po
@@ -1,49 +1,50 @@
-# SOME DESCRIPTIVE TITLE
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
-"PO-Revision-Date: 2016-07-05 23:28+0100\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2018-02-04 07:50+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
+"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "When <span class=\"application\">Tails Greeter</span> appears, in the "
-#| "<span class=\"guilabel\">Welcome to Tails</span> window, click on the "
-#| "<span class=\"button\">Yes</span> button. Then click on the <span class="
-#| "\"button\">Forward</span> button."
msgid ""
"When <span class=\"application\">Tails Greeter</span> appears, click on the "
"<span class=\"button\">[[!img lib/list-add.png alt=\"Expand\" class="
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
-"Quand le <span class=\"application\">Tails Greeter</span> apparaît, dans la "
-"fenêtre <span class=\"guilabel\">Bienvenue dans Tails</span>, cliquez sur le "
-"bouton <span class=\"button\">Oui</span>. Puis cliquez sur le bouton <span "
-"class=\"button\">Suivant</span>."
+"Lorsque <span class=\"application\">Tails Greeter</span> apparaît, cliquez "
+"sur le bouton <span class=\"button\">[[!img lib/list-add.png alt=\"Étendre\" "
+"class=\"symbolic\" link=\"no\"]]</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
"click on <span class=\"guilabel\">Network Configuration</span>."
msgstr ""
+"Lorsque la fenêtre <span class=\"guilabel\">Paramètres supplémentaires</"
+"span> apparaît, cliquez sur <span class=\"guilabel\">Configuration du "
+"réseau</span>."
#. type: Bullet: '3. '
msgid ""
"Select the <span class=\"guilabel\">Configure a Tor bridge or local proxy</"
"span> option."
msgstr ""
+"Sélectionnez l'option <span class=\"guilabel\">Configurer un bridge Tor ou "
+"un proxy local</span>."
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.it.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.it.po
index 1f44750..8b23149 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.it.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -23,6 +23,11 @@ msgid ""
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.mdwn b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.mdwn
index a35bbc17..9ddbb0a 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.mdwn
@@ -1,6 +1,8 @@
1. When <span class="application">Tails Greeter</span> appears, click on the
<span class="button">[[!img lib/list-add.png alt="Expand" class="symbolic" link="no"]]</span> button.
+ [[!img additional.png link="no" alt="Additional settings of Tails Greeter"]]
+
2. When the <span class="guilabel">Additional Settings</span> dialog appears,
click on <span class="guilabel">Network Configuration</span>.
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.pt.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.pt.po
index 935321a..8cb2e2d 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,6 +23,11 @@ msgid ""
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po b/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
index 8d836a4..7f57c23 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2015-01-16 19:01-0000\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -311,6 +311,11 @@ msgstr ""
"\"button\">Yes</span>. Klicken Sie anschließend auf <span class=\"button"
"\">Forward</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
#, fuzzy
#| msgid ""
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po b/wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po
index 1d6cc77..a458d4c 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -217,6 +217,11 @@ msgid ""
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.fr.po b/wiki/src/doc/first_steps/startup_options/mac_spoofing.fr.po
index 1dc0d99..6ed0a73 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.fr.po
@@ -5,16 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
-"PO-Revision-Date: 2014-04-25 06:29-0000\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
+"PO-Revision-Date: 2018-01-24 18:01+0000\n"
"Last-Translator: \n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language-Team: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -287,48 +287,35 @@ msgstr ""
"Greeter</span>|startup_options#tails_greeter]] :\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "When <span class=\"application\">Tails Greeter</span> appears, in the "
-#| "<span class=\"guilabel\">Welcome to Tails</span> window, click on the "
-#| "<span class=\"button\">Yes</span> button. Then click on the <span class="
-#| "\"button\">Forward</span> button."
msgid ""
"When <span class=\"application\">Tails Greeter</span> appears, click on the "
"<span class=\"button\">[[!img lib/list-add.png alt=\"Expand\" class="
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
-"Quand le <span class=\"application\">Tails Greeter</span> apparaît, dans la "
-"fenêtre <span class=\"guilabel\">Bienvenue dans Tails</span>, cliquer sur le "
-"bouton <span class=\"button\">Oui</span>. Puis cliquer sur le bouton <span "
-"class=\"button\">Suivant</span>."
+"Lorsque <span class=\"application\">Tails Greeter</span> apparaît, cliquez "
+"sur le bouton <span class=\"button\">[[!img lib/list-add.png alt=\"Étendre\" "
+"class=\"symbolic\" link=\"no\"]]</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
#. type: Bullet: '2. '
-#, fuzzy
-#| msgid ""
-#| "In the <span class=\"guilabel\">MAC address spoofing</span> section, "
-#| "deselect the <span class=\"guilabel\">Spoof all MAC addresses</span> "
-#| "option."
msgid ""
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
"click on <span class=\"guilabel\">MAC Address Spoofing</span>."
msgstr ""
-"Dans la section <span class=\"guilabel\">Usurpation d'adresse MAC</span>, "
-"décocher l'option <span class=\"guilabel\">Usurper toutes les adresses MAC</"
-"span>."
+"Lorsque la fenêtre <span class=\"guilabel\">Paramètres supplémentaires</"
+"span> apparaît, cliquez sur <span class=\"guilabel\">Usurpation d'adresse "
+"MAC</span>."
#. type: Bullet: '3. '
-#, fuzzy
-#| msgid ""
-#| "In the <span class=\"guilabel\">MAC address spoofing</span> section, "
-#| "deselect the <span class=\"guilabel\">Spoof all MAC addresses</span> "
-#| "option."
msgid ""
"Select the <span class=\"guilabel\">Don't spoof MAC addresses</span> option."
msgstr ""
-"Dans la section <span class=\"guilabel\">Usurpation d'adresse MAC</span>, "
-"décocher l'option <span class=\"guilabel\">Usurper toutes les adresses MAC</"
-"span>."
+"Sélectionnez l'option <span class=\"guilabel\">Ne pas usurper les adresses "
+"MAC</span>."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.it.po b/wiki/src/doc/first_steps/startup_options/mac_spoofing.it.po
index a2a5a0a..6833f8a 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.it.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Team italiano\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2016-04-03 19:29-0000\n"
"Last-Translator: Zeyev <tbd@tbd.com>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -302,6 +302,11 @@ msgstr ""
"pulsante <span class=\"button\">Sì</span>. Poi clicca sul pulsante <span "
"class=\"button\">Invio</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
#, fuzzy
#| msgid ""
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn b/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
index 6e44256..327e584 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
@@ -111,6 +111,8 @@ Greeter</span>|startup_options#tails_greeter]]:
1. When <span class="application">Tails Greeter</span> appears, click on the
<span class="button">[[!img lib/list-add.png alt="Expand" class="symbolic" link="no"]]</span> button.
+ [[!img additional.png link="no" alt="Additional settings of Tails Greeter"]]
+
2. When the <span class="guilabel">Additional Settings</span> dialog appears,
click on <span class="guilabel">MAC Address Spoofing</span>.
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.pt.po b/wiki/src/doc/first_steps/startup_options/mac_spoofing.pt.po
index 99cf240..a44751b 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 18:26+0100\n"
+"POT-Creation-Date: 2018-01-29 14:25+0100\n"
"PO-Revision-Date: 2014-06-21 19:20-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,6 +299,11 @@ msgstr ""
"<span class=\"button\">Yes</span>. A seguir, clique no botão <span class="
"\"button\">Próximo</span>."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
+msgstr ""
+
#. type: Bullet: '2. '
#, fuzzy
#| msgid ""
diff --git a/wiki/src/donate.de.po b/wiki/src/donate.de.po
index 623e5b3..7124c31 100644
--- a/wiki/src/donate.de.po
+++ b/wiki/src/donate.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-01-23 11:06+0100\n"
+"POT-Creation-Date: 2018-02-04 12:07+0100\n"
"PO-Revision-Date: 2017-10-29 15:41+0100\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
@@ -442,8 +442,8 @@ msgid "<em>Account holder</em>: Center for Cultivation of Technology gGmbH"
msgstr "<em>Kontoinhaber</em>: Center for Cultivation of Technology gGmbH"
#. type: Content of: <div><div><p>
-msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
-msgstr "<em>Verwendungszweck</em>: R43NGFR9 TAILS"
+msgid "<strong>Please make sure to mention the purpose of transfer.</strong>"
+msgstr ""
#. type: Content of: <div><div><h5>
msgid "German bank account (preferred):"
@@ -458,6 +458,12 @@ msgid "<em>BIC</em>: GENODEM1GLS"
msgstr "<em>BIC</em>: GENODEM1GLS"
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgstr "<em>Verwendungszweck</em>: R43NGFR9 TAILS"
+
+#. type: Content of: <div><div><div><p>
msgid "<em>Bank</em>: GLS Gemeinschaftsbank eG"
msgstr "<em>Bank</em>: GLS Gemeinschaftsbank eG"
@@ -537,6 +543,13 @@ msgstr "[[!img expenses.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Unsere Finanzberichte sind [[hier|doc/about/finances]] einsehbar."
+#, fuzzy
+#~| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+#~ msgid ""
+#~ "<em>Purpose of transfer</em>: R43NGFR9 TAILS <em>Bank</em>: GLS "
+#~ "Gemeinschaftsbank eG"
+#~ msgstr "<em>Verwendungszweck</em>: R43NGFR9 TAILS"
+
#~ msgid ""
#~ "<small>Until recently, we asked donors to donate via Zwiebelfreunde e.V. "
#~ "towards Tails. The donations we received there were all (and will all be) "
diff --git a/wiki/src/donate.fa.po b/wiki/src/donate.fa.po
index e6134b5..31c1694 100644
--- a/wiki/src/donate.fa.po
+++ b/wiki/src/donate.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 11:06+0100\n"
+"POT-Creation-Date: 2018-02-04 12:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -307,7 +307,7 @@ msgid "<em>Account holder</em>: Center for Cultivation of Technology gGmbH"
msgstr ""
#. type: Content of: <div><div><p>
-msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgid "<strong>Please make sure to mention the purpose of transfer.</strong>"
msgstr ""
#. type: Content of: <div><div><h5>
@@ -323,6 +323,10 @@ msgid "<em>BIC</em>: GENODEM1GLS"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
msgid "<em>Bank</em>: GLS Gemeinschaftsbank eG"
msgstr ""
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index 4fa1416..0f28191 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-01-23 11:06+0100\n"
+"POT-Creation-Date: 2018-02-04 12:07+0100\n"
"PO-Revision-Date: 2017-10-25 15:54+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -444,8 +444,8 @@ msgstr ""
"<em>Titulaire du compte</em> : Center for Cultivation of Technology gGmbH"
#. type: Content of: <div><div><p>
-msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
-msgstr "<em>Objet du transfert</em> : R43NGFR9 TAILS"
+msgid "<strong>Please make sure to mention the purpose of transfer.</strong>"
+msgstr ""
#. type: Content of: <div><div><h5>
msgid "German bank account (preferred):"
@@ -460,6 +460,12 @@ msgid "<em>BIC</em>: GENODEM1GLS"
msgstr "<em>BIC</em> : GENODEM1GLS"
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgstr "<em>Objet du transfert</em> : R43NGFR9 TAILS"
+
+#. type: Content of: <div><div><div><p>
msgid "<em>Bank</em>: GLS Gemeinschaftsbank eG"
msgstr "<em>Banque</em> : GLS Gemeinschaftsbank eG"
@@ -540,6 +546,13 @@ msgstr "[[!img expenses.fr.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Nos rapports financiers sont disponibles [[ici|doc/about/finances]]."
+#, fuzzy
+#~| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+#~ msgid ""
+#~ "<em>Purpose of transfer</em>: R43NGFR9 TAILS <em>Bank</em>: GLS "
+#~ "Gemeinschaftsbank eG"
+#~ msgstr "<em>Objet du transfert</em> : R43NGFR9 TAILS"
+
#~ msgid ""
#~ "<small>Until recently, we asked donors to donate via Zwiebelfreunde e.V. "
#~ "towards Tails. The donations we received there were all (and will all be) "
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index 5faf791..9e42bad 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -355,7 +355,7 @@ permitted by law.</strong></p>
<h4>Bank Transfer</h4>
<p>
<em>Account holder</em>: Center for Cultivation of Technology gGmbH<br/>
- <em>Purpose of transfer</em>: R43NGFR9 TAILS
+ <strong>Please make sure to mention the purpose of transfer.</strong>
</p>
<h5>German bank account (preferred):</h5>
@@ -363,6 +363,7 @@ permitted by law.</strong></p>
<p>
<em>IBAN</em>: DE65 4306 0967 4111 9411 01<br/>
<em>BIC</em>: GENODEM1GLS<br/>
+ <em>Purpose of transfer</em>: R43NGFR9 TAILS<br/>
<em>Bank</em>: GLS Gemeinschaftsbank eG<br/>
<em>Bank address</em>: Christstrasse 9, 44789, Bochum, Germany
</p>
@@ -374,6 +375,7 @@ permitted by law.</strong></p>
<em>Account number</em>: 8310006087<br />
<em>ACH Routing number</em>: 026073150<br />
<em>Wire routing number</em>: 026073008<br />
+ <em>Purpose of transfer</em>: R43NGFR9 TAILS<br/>
<em>Bank</em>: Transferwise<br />
<em>Bank address</em>: 19 W 24th Street, New York 10010, USA
</p>
diff --git a/wiki/src/donate.it.po b/wiki/src/donate.it.po
index 9d45c8c..580f38a 100644
--- a/wiki/src/donate.it.po
+++ b/wiki/src/donate.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-01-23 11:06+0100\n"
+"POT-Creation-Date: 2018-02-04 12:07+0100\n"
"PO-Revision-Date: 2017-07-21 14:37+0200\n"
"Last-Translator: boyska <piuttosto@logorroici.org>\n"
"Language-Team: \n"
@@ -487,10 +487,8 @@ msgid "<em>Account holder</em>: Center for Cultivation of Technology gGmbH"
msgstr ""
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid "<em>Purpose of transfer</em>: Donation to Tails"
-msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
-msgstr "<em>Purpose of transfer</em>: Donazione per Tails"
+msgid "<strong>Please make sure to mention the purpose of transfer.</strong>"
+msgstr ""
#. type: Content of: <div><div><h5>
msgid "German bank account (preferred):"
@@ -507,6 +505,12 @@ msgid "<em>BIC</em>: GENODEM1GLS"
msgstr "<em>BIC</em>: GENODEM1GLS"
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<em>Purpose of transfer</em>: Donation to Tails"
+msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgstr "<em>Purpose of transfer</em>: Donazione per Tails"
+
+#. type: Content of: <div><div><div><p>
msgid "<em>Bank</em>: GLS Gemeinschaftsbank eG"
msgstr "<em>Bank</em>: GLS Gemeinschaftsbank eG"
@@ -596,6 +600,13 @@ msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr ""
"I nostri report finanziari sono consultabili [[qui|doc/about/finances]]."
+#, fuzzy
+#~| msgid "<em>Purpose of transfer</em>: Donation to Tails"
+#~ msgid ""
+#~ "<em>Purpose of transfer</em>: R43NGFR9 TAILS <em>Bank</em>: GLS "
+#~ "Gemeinschaftsbank eG"
+#~ msgstr "<em>Purpose of transfer</em>: Donazione per Tails"
+
#~ msgid ""
#~ "Your donation will be handled by RiseupLabs which is a 501(c)(3) non-"
#~ "profit organization in the USA."
diff --git a/wiki/src/donate.pt.po b/wiki/src/donate.pt.po
index e6134b5..31c1694 100644
--- a/wiki/src/donate.pt.po
+++ b/wiki/src/donate.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 11:06+0100\n"
+"POT-Creation-Date: 2018-02-04 12:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -307,7 +307,7 @@ msgid "<em>Account holder</em>: Center for Cultivation of Technology gGmbH"
msgstr ""
#. type: Content of: <div><div><p>
-msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgid "<strong>Please make sure to mention the purpose of transfer.</strong>"
msgstr ""
#. type: Content of: <div><div><h5>
@@ -323,6 +323,10 @@ msgid "<em>BIC</em>: GENODEM1GLS"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
msgid "<em>Bank</em>: GLS Gemeinschaftsbank eG"
msgstr ""
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fr.po b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
index 27cf44a..e764679 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-01-23 18:31+0100\n"
-"PO-Revision-Date: 2018-01-04 16:04+0000\n"
+"PO-Revision-Date: 2018-01-26 12:49+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -136,23 +136,15 @@ msgstr ""
"que l'on pourrait vous forcer ou vous manipuler afin de divulguer votre phrase de passe.</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>It is possible to\n"
-#| "open the encrypted persistent storage from other operating systems, but it might break\n"
-#| "your security.\n"
-#| "Other operating systems should probably not be trusted to handle\n"
-#| "sensitive information or leave no trace.</p>\n"
+#, no-wrap
msgid ""
"<p>It is possible to\n"
"open the encrypted persistent storage from other operating systems. But, doing\n"
"so might compromise the security provided by Tails.</p>\n"
msgstr ""
"<p>Il est possible\n"
-"d'ouvrir l'espace de stockage persistant chiffré sur d'autres systèmes d'exploitation,\n"
-"mais cela peut nuire à votre sécurité.\n"
-"Il est difficile de faire confiance à d'autres systèmes d'exploitations pour manipuler\n"
-"des données sensibles ou ne pas laisser de traces.</p>\n"
+"d'ouvrir l'espace de stockage persistant chiffré depuis d'autres systèmes d'exploitation,\n"
+"mais cela peut nuire à la sécurité fournie par Tails.</p>\n"
#. type: Plain text
#, no-wrap
@@ -161,24 +153,17 @@ msgid ""
"system. Or, the contents of files might be indexed by the other operating\n"
"system.</p>\n"
msgstr ""
+"<p>Par exemple, des miniatures d'images pourraient être crées et sauvegardées par l'autre système\n"
+"d'exploitation. Ou le contenu de fichiers pourrait être indexé par l'autre système.</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>It is possible to\n"
-#| "open the encrypted persistent storage from other operating systems, but it might break\n"
-#| "your security.\n"
-#| "Other operating systems should probably not be trusted to handle\n"
-#| "sensitive information or leave no trace.</p>\n"
+#, no-wrap
msgid ""
"<p>Other operating systems should probably not be trusted to handle\n"
"sensitive information or leave no trace.</p>\n"
msgstr ""
-"<p>Il est possible\n"
-"d'ouvrir l'espace de stockage persistant chiffré sur d'autres systèmes d'exploitation,\n"
-"mais cela peut nuire à votre sécurité.\n"
-"Il est difficile de faire confiance à d'autres systèmes d'exploitations pour manipuler\n"
-"des données sensibles ou ne pas laisser de traces.</p>\n"
+"<p>Les autres systèmes d'exploitations ne doivent certainement pas être considérés de confiance\n"
+"pour manipuler des données sensibles ou ne pas laisser de traces.</p>\n"
#. type: Title -
#, no-wrap
@@ -281,10 +266,9 @@ msgid "In <span class=\"application\">Tails Greeter</span>:"
msgstr "Dans <span class=\"application\">Tails Greeter</span> :"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/greeter_with_persistence.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails', 'Use persistence? [Yes/No]', 'More options? [Yes/No]'\" ]]\n"
+#, no-wrap
msgid " [[!img install/inc/screenshots/greeter_with_persistence.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr " [[!img install/inc/screenshots/greeter_with_persistence.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails', 'Use persistence? [Yes/No]', 'More options? [Yes/No]'\" ]]\n"
+msgstr " [[!img install/inc/screenshots/greeter_with_persistence.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter : 'Bienvenue dans Tails !'\"]]\n"
#. type: Bullet: ' - '
msgid ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
index 5b04ae1..2fd1914 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-01-23 18:26+0100\n"
-"PO-Revision-Date: 2018-01-04 16:08+0000\n"
+"PO-Revision-Date: 2018-01-26 12:53+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -560,10 +560,9 @@ msgstr ""
" </div>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails', 'More options? [Yes/No]'\"]]\n"
+#, no-wrap
msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails', 'More options? [Yes/No]'\"]]\n"
+msgstr " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\" alt=\"Tails Greeter : 'Bienvenue dans Tails !'\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/lib/partners/i2p.png b/wiki/src/lib/partners/i2p.png
index 1bf291d..2ed7d4b 100644
--- a/wiki/src/lib/partners/i2p.png
+++ b/wiki/src/lib/partners/i2p.png
Binary files differ
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 720deee..5b62adb 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -516,11 +516,17 @@ form {
max-width: 45em;
}
+.searchform {
+ margin: 0 auto;
+ max-width: 930px;
+ position: relative;
+}
+
form#searchform {
overflow: visible;
position: absolute;
- top:-3.5em;
- right: 4em;
+ top: 1em;
+ right: 1em;
}
@media all and (max-width: 639px) {
@@ -529,9 +535,8 @@ form#searchform {
height: 3em;
}
form#searchform {
- position: relative;
top: 0.5em !important;
- right: auto !important;
+ float: right;
}
}
diff --git a/wiki/src/news/version_3.5.fr.po b/wiki/src/news/version_3.5.fr.po
index 918a909..e448bf4 100644
--- a/wiki/src/news/version_3.5.fr.po
+++ b/wiki/src/news/version_3.5.fr.po
@@ -3,152 +3,174 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 19:59+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-01-31 16:43+0100\n"
+"PO-Revision-Date: 2018-01-24 17:12+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Tue, 22 Jan 2018 12:34:56 +0000\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Tue, 22 Jan 2018 12:34:56 +0000\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 3.5 is out\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Tails 3.5 est sorti\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_3.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_3.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
+"Cette version corrige [[plusieurs failles de sécurité|security/"
+"Numerous_security_holes_in_3.4]] et la mise à jour doit être faite dès que "
+"possible."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Changements"
#. type: Title ##
#, no-wrap
msgid "New features"
-msgstr ""
+msgstr "Nouvelles fonctionnalités"
#. type: Bullet: '- '
msgid ""
-"Tor redesigned *Tor Launcher*, the application to configure a [[Tor "
-"bridge|doc/first_steps/startup_options/bridge_mode]] or a local proxy."
+"Tor redesigned *Tor Launcher*, the application to configure a [[Tor bridge|"
+"doc/first_steps/startup_options/bridge_mode]] or a local proxy."
msgstr ""
+"Tor a remanié le *Tor Launcher*, l'application pour configurer un [[bridge "
+"Tor|doc/first_steps/startup_options/bridge_mode]] ou un proxy local."
#. type: Plain text
#, no-wrap
msgid " [[!img tor-launcher.png link=\"no\"]]\n"
-msgstr ""
+msgstr " [[!img tor-launcher.png link=\"no\"]]\n"
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Mises à jour et changements"
#. type: Plain text
msgid "- Update *Tor Browser* to 7.5."
-msgstr ""
+msgstr "- Mise à jour du *Navigateur Tor* vers la version 7.5."
#. type: Bullet: '- '
msgid ""
"Update *Linux* to 4.14.13 and the microcode firmware for AMD to mitigate "
"Spectre."
msgstr ""
+"Mise à jour de *Linux* vers la version 4.14.13 et le microcode de AMD pour "
+"atténuer Spectre."
#. type: Plain text
msgid "- Update *Thunderbird* to 52.5."
-msgstr ""
+msgstr "- Mise à jour de *Thunderbird* vers la version 52.5."
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Problèmes corrigés"
#. type: Bullet: '- '
msgid ""
-"Fix printing to a PDF in *Tor Browser*. ([[!tails_ticket 13403]] and "
-"[[!tails_ticket 15024]])"
+"Fix printing to a PDF in *Tor Browser*. ([[!tails_ticket 13403]] and [[!"
+"tails_ticket 15024]])"
msgstr ""
+"Correction de l'impression de PDF dans le *Navigateur Tor*. ([[!tails_ticket "
+"13403]] et [[!tails_ticket 15024]])"
#. type: Bullet: '- '
msgid ""
"Fix the opening of the **Applications** menu when the time synchronization "
"changed the clock in the past. ([[!tails_ticket 14250]])"
msgstr ""
+"Correction de l'ouverture du menu **Applications** lorsque la "
+"synchronisation de l'heure ramène l'horloge dans le passé. ([[!tails_ticket "
+"14250]])"
#. type: Bullet: '- '
msgid ""
"Fix the opening of the documentation included in Tails for many non-English "
"languages. ([[!tails_ticket 15160]])"
msgstr ""
+"Correction de l'ouverture de la documentation embarquée dans Tails pour "
+"plusieurs langues autres que l'anglais. ([[!tails_ticket 15160]])"
#. type: Bullet: '- '
msgid ""
"Fix translations of the time synchronization and \"*Tor is ready*\" "
"notifications. ([[!tails_ticket 13437]])"
msgstr ""
+"Correction de la traduction des notifications sur la synchronisation du "
+"temps et \"*Tor est prêt*\". ([[!tails_ticket 13437]])"
#. type: Bullet: '- '
msgid ""
"Remove the code to migrate from *Claws Mail* that was preventing "
"*Thunderbird* to start in some cases. ([[!tails_ticket 12734]])"
msgstr ""
+"Suppression du code pour migrer depuis *Claws Mail* qui empêchait "
+"*Thunderbird* de démarrer dans certains cas. ([[!tails_ticket 12734]])"
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
+"Pour plus de détails, lisez notre [[!tails_gitweb debian/changelog desc="
+"\"liste des changements\"]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"known-issues\"></a>\n"
-msgstr ""
+msgstr "<a id=\"known-issues\"></a>\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Problèmes connus"
#. type: Bullet: '- '
msgid ""
"Debug and error messages appear when starting Tails, including an alarming "
"message about a *kernel BUG*."
msgstr ""
+"Des messages d'erreur et de debug apparaissent lors du démarrage de Tails, "
+"incluant un message alarmant à propos d'un *kernel BUG*."
#. type: Plain text
#, no-wrap
msgid " These messages do not affect the safety of Tails.\n"
-msgstr ""
+msgstr " Ces messages n'affectent pas la sécurité de Tails.\n"
#. type: Plain text
#, no-wrap
msgid " [[!img logs.png link=\"no\"]]\n"
-msgstr ""
+msgstr " [[!img logs.png link=\"no\"]]\n"
#. type: Bullet: '- '
msgid ""
@@ -156,35 +178,47 @@ msgid ""
"**Use a downloaded Tails ISO image** when running Tails in English. For "
"other language, the file chooser button remains inactive:"
msgstr ""
+"Dans l'*Installeur de Tails*, lorsque l'on choisit **Utiliser une image ISO "
+"Tails téléchargée**, il est seulement possible de sélectionner une image ISO "
+"quand Tails fonctionne en anglais. Dans les autres langues, le bouton de "
+"choix du fichier reste inactif :"
#. type: Plain text
#, no-wrap
msgid " [[!img broken-file-chooser.png link=\"no\"]]\n"
-msgstr ""
+msgstr " [[!img broken-file-chooser.png link=\"no\"]]\n"
#. type: Bullet: '- '
msgid ""
-"The documentation shipped in Tails doesn't open in *Tor Browser* "
-"anymore. The warning page of the *Unsafe Browser* also lacks graphical "
-"design. ([[!tails_ticket 14962]] and [[!tor_bug 24243 desc=\"Tor #24243\"]])"
+"The documentation shipped in Tails doesn't open in *Tor Browser* anymore. "
+"The warning page of the *Unsafe Browser* also lacks graphical design. ([[!"
+"tails_ticket 14962]] and [[!tor_bug 24243 desc=\"Tor #24243\"]])"
msgstr ""
+"La documentation embarquée dans Tails ne s'ouvre plus avec le *Navigateur "
+"Tor*. Il manque également le design graphique de la page d'avertissement du "
+"*Navigateur non-sécurisé*. ([[!tails_ticket 14962]] et [[!tor_bug 24243 desc="
+"\"Tor #24243\"]])"
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
msgstr ""
+"Voir la liste des [[problèmes connus de longue date|support/known_issues]]."
#. type: Title #
#, no-wrap
msgid "Get Tails 3.5"
-msgstr ""
+msgstr "Obtenir Tails 3.5"
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+"- Pour l'installer, suivez nos [[instructions d'installation|install]]."
#. type: Plain text
msgid "- To upgrade, automatic upgrades are available from 3.3 and 3.4 to 3.5."
msgstr ""
+"- Pour mettre à jour, des mises à jour automatiques sont disponibles depuis "
+"les versions 3.3 et 3.4 vers la version 3.5."
#. type: Plain text
#, no-wrap
@@ -192,29 +226,32 @@ msgid ""
" If you cannot do an automatic upgrade or if you fail to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
+" Si vous ne pouvez pas faire une mise à jour automatique ou si le démarrage échoue après une\n"
+" mise à jour automatique, merci d'essayer de faire une [[mise à jour manuelle|upgrade]].\n"
#. type: Plain text
msgid "- [[Download Tails 3.5.|install/download]]"
-msgstr ""
+msgstr "- [[Télécharger Tails 3.5.|install/download]]"
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Et ensuite ?"
#. type: Plain text
msgid "Tails 3.6 is [[scheduled|contribute/calendar]] for March 13."
-msgstr ""
+msgstr "Tails 3.6 est [[prévu|contribute/calendar]] pour le 13 mars."
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Jetez un œil à notre [[!tails_roadmap desc=\"feuille de route\"]] pour "
+"savoir ce que nous avons en tête."
#. type: Plain text
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.5\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.5\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
-msgstr ""
+msgstr "Nous avons besoin de votre aide et il y a de nombreuses manières de [[contribuer à Tails|contribute]] (<a href=\"https://tails.boum.org/donate/index.fr.html?r=3.5\">faire un don</a> est seulement l'une d'entre elles). Venez [[discuter avec nous|about/contact#tails-dev]] !\n"
diff --git a/wiki/src/news/windows_camouflage_jessie.fr.po b/wiki/src/news/windows_camouflage_jessie.fr.po
index 38faa95..e387fc8 100644
--- a/wiki/src/news/windows_camouflage_jessie.fr.po
+++ b/wiki/src/news/windows_camouflage_jessie.fr.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2016-11-17 12:09+0000\n"
-"PO-Revision-Date: 2015-01-14 13:01+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2018-01-27 15:31+0000\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -24,17 +24,17 @@ msgstr "[[!meta title=\"Aidez-nous à adapter le camouflage Windows pour GNOME 3
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Mon, 05 Jan 2015 12:00:00 +0000\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Mon, 05 Jan 2015 12:00:00 +0000\"]]\n"
#. type: Plain text
#, no-wrap
msgid "**Call for participation!**\n"
-msgstr ""
+msgstr "**Appel à participation !**\n"
#. type: Plain text
msgid ""
@@ -43,11 +43,16 @@ msgid ""
"needing privacy and stealth? Consider porting the \"Windows camouflage\" of "
"Tails to GNOME 3.14."
msgstr ""
+"Vous participez au développement de GNOME et vous voulez participer à "
+"Tails ? Voulez-vous améliorer vos compétences sur les thèmes GTK ou GNOME "
+"Shell tout en aidant les personnes utilisant Tails qui ont besoin d'intimité "
+"et de discrétion ? Envisagez de porter le « camouflage Windows » de Tails "
+"vers GNOME 3.14."
#. type: Title #
#, no-wrap
msgid "What is the Windows camouflage?"
-msgstr ""
+msgstr "Qu'est-ce que le camouflage Windows ?"
#. type: Plain text
msgid ""
@@ -56,11 +61,15 @@ msgid ""
"into something that resembles Microsoft Windows 8.\" This is what we call "
"the \"Windows camouflage\"."
msgstr ""
+"La documentation de Tails indique « si vous utilisez un ordinateur en public "
+"vous pouvez vouloir éviter d'attirer l'attention en modifiant l'apparence de "
+"Tails de façon à ce qu'il ressemble à Microsoft Windows 8 ». C'est ce que "
+"nous appelons le « camouflage Windows »."
#. type: Title #
#, no-wrap
msgid "Why is it useful?"
-msgstr ""
+msgstr "Pourquoi est-ce utile ?"
#. type: Plain text
msgid ""
@@ -68,11 +77,15 @@ msgid ""
"distribution because their screen looked very different from others, which "
"raised suspicion. It's why a Windows camouflage has been added to Tails."
msgstr ""
+"On nous a signalé que des personnes utilisant une distribution qui protège "
+"l'intimité ont été arrêté parce que leur affichage est très différent des "
+"autres, ce qui a suscité des soupçons. C'est pourquoi le camouflage Windows "
+"a été ajouté à Tails."
#. type: Title #
#, no-wrap
msgid "What should be done?"
-msgstr ""
+msgstr "Que faut-il faire ?"
#. type: Plain text
msgid ""
@@ -83,11 +96,17 @@ msgid ""
"includes GTK and GNOME Shell theming through CSS as well as writing a custom "
"GNOME Shell extension."
msgstr ""
+"La version actuelle de Tails est basée sur GNOME 3.8 dans le mode « Fallback "
+"». Nous sommes actuellement en train de mettre à jour Tails vers la future "
+"version de Debian (« Jessie ») qui est basée sur GNOME 3.14. Le camouflage "
+"Windows doit être mis à jour vers la dernière version de GTK et porté de "
+"GNOME Panel à GNOME Shell. Cela comprend les thèmes GTK et GNOME Shell "
+"utilisant des CSS qui doit être écrit comme une extension GNOME Shell."
#. type: Title #
#, no-wrap
msgid "Why do we need you?"
-msgstr ""
+msgstr "Pourquoi avons-nous besoin de vous ?"
#. type: Plain text
msgid ""
@@ -99,11 +118,20 @@ msgid ""
"provide support to anybody volunteering and work together on integrating the "
"new theme to upcoming Tails Jessie snapshots."
msgstr ""
+"L'équipe qui travaille actuellement sur Tails est très occupée et a décidé "
+"de se concentrer sur le cœur ou la mise-à-jour plutôt que sur le camouflage "
+"Windows. Nous avons actuellement le projet d'aller vers la première version "
+"de Tails basé sur Jessie, même si le camouflage Windows est absent. "
+"Toutefois, nous aimerions livrer un camouflage Windows propre et nous "
+"pensons que c'est une bonne occasion pour vous de nous donner un coup de "
+"main. Nous fournirons le support à tous les volontaires et nous "
+"travaillerons ensemble sur l'intégration de ce nouveau thème dans les "
+"futures versions de Tails basées sur Jessie."
#. type: Title #
#, no-wrap
msgid "Where should you start?"
-msgstr ""
+msgstr "Par où devez-vous commencer ?"
#. type: Plain text
#, no-wrap
@@ -113,3 +141,7 @@ msgid ""
"write to <tails-dev@boum.org>. This is a public mailing list:\n"
"<https://mailman.boum.org/listinfo/tails-dev/>. Please subscribe!\n"
msgstr ""
+"Merci de lire\n"
+"<https://tails.boum.org/blueprint/update_camouflage_for_jessie/>, puis\n"
+"écrivez à <tails-dev@boum.org>. C'est une liste de messages publique :\n"
+"<https://mailman.boum.org/listinfo/tails-dev/>. Merci de vous inscrire !\n"
diff --git a/wiki/src/partners.fr.po b/wiki/src/partners.fr.po
index 7a8d5b1..30f23ef 100644
--- a/wiki/src/partners.fr.po
+++ b/wiki/src/partners.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-01-23 11:38+0100\n"
-"PO-Revision-Date: 2018-01-12 18:00+0000\n"
+"PO-Revision-Date: 2018-01-26 12:34+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
@@ -122,23 +122,19 @@ msgstr "50 000$ – 99 000$"
#. type: Attribute 'title' of: <div><p>
msgid "Mozilla Open Source Support - $77.000"
-msgstr ""
+msgstr "Mozilla Open Source Support - 77 000$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/mozilla.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/mozilla.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "ExpressVPN - $1.000"
-msgstr ""
+msgstr "ExpressVPN - 1 000$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/expressvpn.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/expressvpn.png link=\"no\"]]"
#. type: Content of: <p>
msgid "in-kind"
@@ -146,13 +142,11 @@ msgstr "en nature"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - Travel to Tor dev meeting & server rent"
-msgstr ""
+msgstr "Tor - Transport pour le Tor dev meeting et location de serveur"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/tor.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/tor.png link=\"no\"]]"
#. type: Content of: outside any tag (error?)
msgid "<span class=\"clearfix\"></span>"
@@ -168,13 +162,11 @@ msgstr "&gt; 100 000$"
#. type: Attribute 'title' of: <div><p>
msgid "Open Technology Fund - $208.800"
-msgstr ""
+msgstr "Open Technology Fund - 208 800$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/otf.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/otf.png link=\"no\"]]"
#. type: Content of: <p>
msgid "$10.000 – $49.999"
@@ -193,16 +185,12 @@ msgid "Anonymous donation - 2.902€"
msgstr "Don anonyme - 2 902€"
#. type: Attribute 'title' of: <div><p>
-#, fuzzy
-#| msgid "An individual - 2.000€"
msgid "Mediapart - 2.000€"
-msgstr "Un individu - 2 000€"
+msgstr "Mediapart - 2 000€"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/mediapart.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/mediapart.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "An individual - 2.000€"
@@ -226,17 +214,15 @@ msgstr "Don anonyme - 1 161€"
#. type: Attribute 'title' of: <div><p>
msgid "Google - GSoC Tails Server"
-msgstr ""
+msgstr "Google - GSoC Tails Server"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/gsoc.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/gsoc.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - Travel sponsorship & server rent"
-msgstr ""
+msgstr "Tor - Financement de transports et location de serveur"
#. type: Content of: <h2>
msgid "2015"
@@ -248,23 +234,19 @@ msgstr "50 000$ – 99 999$"
#. type: Attribute 'title' of: <div><p>
msgid "Hivos International - 70.000€"
-msgstr ""
+msgstr "Hivos International - 70 000€"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/hivos.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/hivos.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "DuckDuckGo - $25.000"
-msgstr ""
+msgstr "DuckDuckGo - 25 000$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/ddg.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/ddg.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Laura Poitras & Edward Snowden, Ridenhour's film award - $10.000"
@@ -281,27 +263,23 @@ msgstr "Edward Snowden"
#. type: Attribute 'title' of: <div><p>
msgid "Freedom of the Press Foundation - $8.859"
-msgstr ""
+msgstr "Freedom of the Press Foundation - 8 859$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/fpf.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/fpf.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Localization Lab - Translation to Farsi"
-msgstr ""
+msgstr "Localization Lab - Traduction en persan"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/localizationlab.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/localizationlab.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - Server rent"
-msgstr ""
+msgstr "Tor - Location de serveur"
#. type: Content of: <h2>
msgid "2014"
@@ -309,55 +287,47 @@ msgstr "2014"
#. type: Attribute 'title' of: <div><p>
msgid "Access Now - 50.000€"
-msgstr ""
+msgstr "Access Now - 50 000€"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/accessnow.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/accessnow.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Freedom of the Press Foundation - $33.377"
-msgstr ""
+msgstr "Freedom of the Press Foundation - 33 377$"
#. type: Attribute 'title' of: <div><p>
msgid "Open Internet Tools - $25.800"
-msgstr ""
+msgstr "Open Internet Tools - 25 800$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/openitp.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/openitp.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Förderung Freier Information und Software - 5.000€"
-msgstr ""
+msgstr "Förderung Freier Information und Software - 5 000€"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/ffis.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/ffis.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Debian - $5.000"
-msgstr ""
+msgstr "Debian - 5 000$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/debian.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/debian.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - $5.000"
-msgstr ""
+msgstr "Tor - 5 000$"
#. type: Attribute 'title' of: <div><p>
msgid "Mozilla - Travel to Tails hackfest"
-msgstr ""
+msgstr "Mozilla - Transport pour le Tails hackfest"
#. type: Content of: <h2>
msgid "2013"
@@ -365,17 +335,15 @@ msgstr "2013"
#. type: Attribute 'title' of: <div><p>
msgid "National Democratic Institute - $21.000"
-msgstr ""
+msgstr "National Democratic Institute - 21 000$"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "[[!img lib/partners/anonymous.png link=\"no\"]]"
msgid "[[!img lib/partners/ndi.png link=\"no\"]]"
-msgstr "[[!img lib/partners/anonymous.png link=\"no\"]]"
+msgstr "[[!img lib/partners/ndi.png link=\"no\"]]"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - $20.000"
-msgstr ""
+msgstr "Tor - 20 000$"
#. type: Content of: <h2>
msgid "2012"
@@ -387,7 +355,7 @@ msgstr "2011"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - $10.950"
-msgstr ""
+msgstr "Tor - 10 950$"
#. type: Content of: <h2>
msgid "2010"
@@ -395,7 +363,7 @@ msgstr "2010"
#. type: Attribute 'title' of: <div><p>
msgid "Tor - 8.500€"
-msgstr ""
+msgstr "Tor - 8 500€"
#. type: Content of: outside any tag (error?)
msgid "\"\"\"]]"
diff --git a/wiki/src/partners/become.mdwn b/wiki/src/partners/become.mdwn
index e810073..c94d01e 100644
--- a/wiki/src/partners/become.mdwn
+++ b/wiki/src/partners/become.mdwn
@@ -17,30 +17,51 @@ criteria below must be met. A partner provides either:
<a id="benefits"></a>
-Benefits
-========
+Benefits for partners
+=====================
+<!-- keep this info in sync with fundraising/partners_donations. start -->
+
+* Your logo will appear in the top section of our partners page:
+ https://tails.boum.org/partners.
-* Your donation is tax-deductible to the full extent permitted by law.
-* Your logo will appear in the top section of our [[partners page|partners]].
You can decide to be added as soon as we receive your donation or
at the beginning of the following year, if you prefer.
+
Partners from previous years will still be listed but less visible.
+
+ If possible, please send us your logo as file, minimum 85 pixels in
+ height, varying width, 72dpi, JPG or PNG.
+
* Your homepage will be linked from our partners page during the year of
your donation. Our website is very well ranked by search engines and
having your site linked from ours is beneficial for SEO.
+
Our partners page is linked to from our homepage and donation pages.
+
* You may advertise your donation to Tails on your website as well as on
social media.
+
* You can receive up to 5 Tails T-shirts. We do not sell these T-shirts,
they are only given out to partners and individual donors. If you want
T-shirts, tell us which sizes:
+
- Fit (women): S, M, and L
- Straight (men): S, M, L, XL, and 2XL.
+Your donation might be tax-deductible
+=====================================
+
+We have two non-profit fiscal sponsors:
+
+* The Center for Cultivation of Technology, a gGmbH in Germany.
+* RiseupLabs, a 501(c)(3) non-profit in the USA.
+
+Please verify with your local fiscal administration which of them
+would make your donation tax-deducible.
+
+<!-- /end of syncable information -->
+
Contact
=======
For detailed information please get in touch with us at <tails-fundraising@boum.org>.
-
-If possible, please send us your logo as file, minimum 85 pixels in
-height, varying width, 72dpi, JPG or PNG.
diff --git a/wiki/src/security/Numerous_security_holes_in_3.4.fr.po b/wiki/src/security/Numerous_security_holes_in_3.4.fr.po
index b73ce86..d88b008 100644
--- a/wiki/src/security/Numerous_security_holes_in_3.4.fr.po
+++ b/wiki/src/security/Numerous_security_holes_in_3.4.fr.po
@@ -3,66 +3,73 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-23 19:59+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-01-31 16:43+0100\n"
+"PO-Revision-Date: 2018-01-24 17:15+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sat, 21 Jan 2018 12:34:56 +0000\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Sat, 21 Jan 2018 12:34:56 +0000\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Numerous security holes in Tails 3.4\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Plusieurs failles de sécurité dans Tails 3.4\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag security/fixed]]\n"
-msgstr ""
+msgstr "[[!tag security/fixed]]\n"
#. type: Plain text
-msgid "Several security holes that affect Tails 3.4 are now fixed in Tails 3.5."
+msgid ""
+"Several security holes that affect Tails 3.4 are now fixed in Tails 3.5."
msgstr ""
+"Plusieurs failles de sécurité qui affectent Tails 3.4 sont maintenant "
+"corrigées dans Tails 3.5."
#. type: Plain text
msgid ""
"We **strongly** encourage you to [[upgrade to Tails 3.5|news/version_3.5]] "
"as soon as possible."
msgstr ""
+"Nous vous encourageons *vivement* à [[mettre à jour vers Tails 3.5|news/"
+"version_3.5]] dès que possible."
#. type: Bullet: '- '
msgid ""
-"Tor Browser: [MSFA "
-"2018-03](https://www.mozilla.org/en-US/security/advisories/mfsa2018-03/)"
+"Tor Browser: [MSFA 2018-03](https://www.mozilla.org/en-US/security/"
+"advisories/mfsa2018-03/)"
msgstr ""
+"Navigateur Tor : [MSFA 2018-03](https://www.mozilla.org/en-US/security/"
+"advisories/mfsa2018-03/)"
#. type: Bullet: '- '
msgid "amd64-microcode: [[!cve CVE-2017-5715]]"
-msgstr ""
+msgstr "amd64-microcode : [[!cve CVE-2017-5715]]"
#. type: Bullet: '- '
msgid "thunderbird: [[!debsa2017 4075]], [[!debsa2017 4061]]"
-msgstr ""
+msgstr "thunderbird : [[!debsa2017 4075]], [[!debsa2017 4061]]"
#. type: Bullet: '- '
msgid "libxml2: [[!debsa2018 4086]]"
-msgstr ""
+msgstr "libxml2 : [[!debsa2018 4086]]"
#. type: Bullet: '- '
msgid "gdk-pixbuf: [[!debsa2018 4088]]"
-msgstr ""
+msgstr "gdk-pixbuf : [[!debsa2018 4088]]"
#. type: Bullet: '- '
msgid "bind9: [[!debsa2018 4089]]"
-msgstr ""
+msgstr "bind9 : [[!debsa2018 4089]]"
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 3647180..5460d8f 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-01-22 23:32+0100\n"
-"PO-Revision-Date: 2018-01-20 12:56+0000\n"
+"PO-Revision-Date: 2018-01-24 17:26+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -1525,7 +1525,7 @@ msgstr "\techo \"no-grab\" >> ~/.gnupg/gpg-agent.conf\n"
#. type: Title ##
#, no-wrap
msgid "Problems when the system clock goes backwards"
-msgstr ""
+msgstr "Problèmes lorsque l'horloge système remonte le temps"
#. type: Plain text
msgid ""
@@ -1551,15 +1551,12 @@ msgstr ""
"des problèmes logiciels dans Tails."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "For example, when this happens the <span\n"
-#| "class=\"guimenu\">Applications</span> menu sometimes stops working.\n"
+#, no-wrap
msgid ""
"For example, when this happened in Tails 3.4 the <span\n"
"class=\"guimenu\">Applications</span> menu sometimes stops working.\n"
msgstr ""
-"Par exemple, lorsque cela arrive le menu <span\n"
+"Par exemple, lorsque cela arrive dans Tails 3.4 le menu <span\n"
"class=\"guimenu\">Applications</span> arrête parfois de fonctionner.\n"
#. type: Plain text
diff --git a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml
deleted file mode 100644
index 3a840f7..0000000
--- a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: amd64
-channel: alpha
-product-name: Tails
-product-version: 3.4~rc1
diff --git a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml.pgp
deleted file mode 100644
index 28c3641..0000000
--- a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/alpha/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAlnKLbEACgkQmP7GvHUq
-PbYCgw/+LsGrJr+teQnRdwaiGNmq4t8LpWGcq1t1Lk10qxxAOzkwg10YruZrfdfa
-HGvF+ww2vtbM5lvkuQsf4XfjbK4QCoh4FKmioP+8EifdKuepE2yQyks10PNKzIJD
-1vffsXH5X9TuVj9lDY8NoY/YzLIYLSTi0wQHAZVnZCYGx4KJiEXAiPJ34aZgQ5MY
-8JcZB+98Cn1A0cSQMEiOz5A+v/ksjADskqPnUNFSZlKg+QFAEK9WJjaVwqTRalVR
-Ns+p6OiHXAdfCyZ2NWN5i+nzsVu8Ql2uhAn7lm71v/inK5rQnSHN/iKpJRCv29q5
-xP9Iu7JacBu+K9ONXEVfzHaZOJWg1hvpdRCuaQlVITep9GToFHXKZtIc/8GVKfWr
-ALE7zvfBlLXIBzbpxzha+P2V4ZCtKFGk6Z8x51zMqS/CAVjf3JyJTmGb2qnmaXXg
-hk7vt4mwVQmktSFrcUwmwP9hM5QZMVMADBRHdLqwE3cUCRjKXmEDUvY19LXjEp4J
-i/YpAvOyPjiE/3gco8bR1hkYJXRXcfnPDZP3ptxkSofSOmqk0E6HJDBtuSLyKD/J
-dkqCVMdhvfuh8AOoFtJ7frLckHQvvbRMWeH7L7dwdjHs8yoItKQuC5O78WnlPaWy
-huGb0XfuDUgC9vgD5hJyQN2VevuRnNv/4kx5D72OMfTXEgUgnB4=
-=ay5d
------END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml
deleted file mode 100644
index 33a8471..0000000
--- a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: amd64
-channel: stable
-product-name: Tails
-product-version: 3.4~rc1
diff --git a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml.pgp
deleted file mode 100644
index 31c1a52..0000000
--- a/wiki/src/upgrade/v1/Tails/3.4~rc1/amd64/stable/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAlnKLaQACgkQmP7GvHUq
-PbbPcg/9Hynah2N5qtE98X90Y7z+XIarKplcyD0h4WiUJNCNZSdk8AX2YUKrr7Wx
-yvwxGTFcYvZdrtRg7gRWtSdEEd3F8UMTH6zHpE3GCFEAslL/3f3Xbf/A1EuwelJO
-4jCrMAdtX3zcdQ8T9gCla4rJL7TVjSGwGAoyjMN4DKX33rmWVv7ASyRCMkC4trgh
-mqYWouZkaqrtz7C7qbAB5m0jBucr6eqKmhgGQSk6ea6Fi9u7XIi4oWuiTnPY8FLc
-86VtgZ98LOkW6x48HdCrEp9N4hYjWPy33nV+lI0ow8Sb/Qx1GxepAWOJCdLvh9+/
-u3e5CiIfPrp7S/lN3bDwkbsRnS8k58+haGCeKaXi3PF/4GZOS71eqD0NdURSlXBG
-nY53kYpBnmr4TN+FKHI7orHVGxOmQq+pprdNfsWKgvttVcXfyvgCrj1tAY4pIRlW
-izqj3HGt62LCTL7RafHBlW7Zxglv1czuyxc8ZMexKVn0ieclnr9JJ48Z6RKR0tPF
-rEy6Okr+/gZKYg6OroFe6OlyuEHm8A8uv0fb/oUL6usUxh9E/AISzU9nQt7fUBpg
-xzT0c2sEL4DZjK8Z4u1LmOzRO3cVYpjodMdxpr/h/vv/8W4orNQw0KYiGEgE0ZN0
-cnp4hYUxtMkouF82tiBImY4sJkPCElbEanoAWvzHRTktOUIqfpk=
-=TnKe
------END PGP SIGNATURE-----