summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2016-02-05 13:02:47 +0000
committersajolida <sajolida@pimienta.org>2016-02-05 13:02:47 +0000
commit3c5e223ba59ab6bed89aba4732b629413976c157 (patch)
tree81ce669aaf2795eab379d2defd4998dd64548314
parentb9a791d8c1cc76a38c6576852667b7961c0fb4d3 (diff)
parentc95e47a14493a1850113a83d9d13dceb96ef95dd (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--wiki/src/blueprint/Linux_containers.mdwn1
-rw-r--r--wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn94
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_01.mdwn70
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn2
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn13
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn23
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn37
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn35
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn46
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn32
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn20
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn22
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn24
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn24
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn27
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn23
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn34
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn34
-rw-r--r--wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn34
-rw-r--r--wiki/src/blueprint/bootstrapping/verification.mdwn2
-rw-r--r--wiki/src/blueprint/follow_parts_of_Redmine.mdwn15
-rw-r--r--wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn113
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn101
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn3
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn15
-rw-r--r--wiki/src/blueprint/monthly_report/report_2015_12.mdwn113
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_01.mdwn109
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_02.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_03.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_04.mdwn0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_05.mdwn0
-rw-r--r--wiki/src/blueprint/report_2015_09.mdwn96
-rw-r--r--wiki/src/blueprint/report_2015_10.mdwn67
-rw-r--r--wiki/src/blueprint/report_2015_11.mdwn75
-rw-r--r--wiki/src/blueprint/report_2015_12.mdwn75
-rw-r--r--wiki/src/blueprint/website_homepage.mdwn2
-rw-r--r--wiki/src/contribute.de.po6
-rw-r--r--wiki/src/contribute.fa.po9
-rw-r--r--wiki/src/contribute.fr.po6
-rw-r--r--wiki/src/contribute.mdwn1
-rw-r--r--wiki/src/contribute.pt.po6
-rw-r--r--wiki/src/contribute/calendar.mdwn30
-rw-r--r--wiki/src/contribute/chat.mdwn12
-rw-r--r--wiki/src/contribute/how/donate.de.po8
-rw-r--r--wiki/src/contribute/how/donate.fa.po8
-rw-r--r--wiki/src/contribute/how/donate.fr.po8
-rw-r--r--wiki/src/contribute/how/donate.mdwn3
-rw-r--r--wiki/src/contribute/how/donate.pt.po8
-rw-r--r--wiki/src/contribute/how/translate.mdwn1
-rw-r--r--wiki/src/contribute/how/translate/team/fa.mdwn4
-rw-r--r--wiki/src/contribute/low-hanging_fruit_sessions.mdwn22
-rw-r--r--wiki/src/contribute/meetings.mdwn8
-rw-r--r--wiki/src/contribute/meetings/201602.mdwn62
-rw-r--r--wiki/src/contribute/release_process.mdwn14
-rw-r--r--wiki/src/contribute/talk.html5
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po35
-rw-r--r--wiki/src/doc/anonymous_internet.index.fa.po73
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po80
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po83
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po74
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn49
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po74
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.de.po13
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.fa.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.fr.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/icedove.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po47
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po19
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po19
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn4
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po19
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.de.po196
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fa.po261
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fr.po191
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.pt.po175
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po386
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po399
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po397
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn145
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po197
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.pngbin27208 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.pngbin25926 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.pngbin18085 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.pngbin17239 -> 13205 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.pngbin33320 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.pngbin34762 -> 17015 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/nautilus_encrypted.pngbin0 -> 52269 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.pngbin55305 -> 47841 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.pngbin52178 -> 0 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.pngbin22813 -> 15196 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.de.po56
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.de.po17
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po33
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po42
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn15
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po17
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.pngbin37206 -> 25925 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.de.po41
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fa.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fr.po18
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.pt.po4
-rw-r--r--wiki/src/doc/first_steps/accessibility.de.po15
-rw-r--r--wiki/src/doc/first_steps/accessibility.fa.po38
-rw-r--r--wiki/src/doc/first_steps/accessibility.fr.po15
-rw-r--r--wiki/src/doc/first_steps/accessibility.pt.po15
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.de.po14
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fa.po110
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fr.po14
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.pt.po14
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po766
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po709
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po760
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po751
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.de.po64
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.fa.po130
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.fr.po120
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.mdwn44
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.pt.po116
-rw-r--r--wiki/src/doc/first_steps/persistence/claws-mail.pngbin4589 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.de.po162
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fa.po138
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fr.po170
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.mdwn54
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.pt.po176
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.de.po4
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fa.po85
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fr.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.mdwn2
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.pt.po215
-rw-r--r--wiki/src/doc/first_steps/reset/linux.de.po106
-rw-r--r--wiki/src/doc/first_steps/reset/linux.fa.po95
-rw-r--r--wiki/src/doc/first_steps/reset/linux.fr.po104
-rw-r--r--wiki/src/doc/first_steps/reset/linux.mdwn45
-rw-r--r--wiki/src/doc/first_steps/reset/linux.pt.po103
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fa.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fr.po27
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn11
-rw-r--r--wiki/src/doc/first_steps/reset/mac.pt.po20
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.de.po12
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fa.po65
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po16
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.pt.po12
-rw-r--r--wiki/src/doc/sensitive_documents/metadata.de.po27
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.de.po37
-rw-r--r--wiki/src/doc/sensitive_documents/persistence.de.po19
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.de.po5
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po25
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po15
-rw-r--r--wiki/src/doc/sensitive_documents/printing_and_scanning.pt.po5
-rw-r--r--wiki/src/inc/release_notes/1.5.de.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.fa.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.fr.po10
-rw-r--r--wiki/src/inc/release_notes/1.5.mdwn4
-rw-r--r--wiki/src/inc/release_notes/1.5.pt.po10
-rw-r--r--wiki/src/inc/release_notes/2.0.de.po128
-rw-r--r--wiki/src/inc/stable_i386_torrent_url.html2
-rw-r--r--wiki/src/install/debian.de.po16
-rw-r--r--wiki/src/install/debian.fa.po16
-rw-r--r--wiki/src/install/debian.fr.po16
-rw-r--r--wiki/src/install/debian.html4
-rw-r--r--wiki/src/install/debian.pt.po16
-rw-r--r--wiki/src/install/expert/usb.de.po4
-rw-r--r--wiki/src/install/expert/usb.fa.po4
-rw-r--r--wiki/src/install/expert/usb.fr.po4
-rw-r--r--wiki/src/install/expert/usb.mdwn2
-rw-r--r--wiki/src/install/expert/usb.pt.po4
-rw-r--r--wiki/src/install/inc/overview.de.po4
-rw-r--r--wiki/src/install/inc/overview.fa.po4
-rw-r--r--wiki/src/install/inc/overview.fr.po4
-rw-r--r--wiki/src/install/inc/overview.pt.po4
-rw-r--r--wiki/src/install/inc/screenshots/desktop.pngbin39652 -> 30054 bytes
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.pt.po4
-rw-r--r--wiki/src/install/linux/usb.de.po6
-rw-r--r--wiki/src/install/linux/usb.fa.po6
-rw-r--r--wiki/src/install/linux/usb.fr.po6
-rw-r--r--wiki/src/install/linux/usb.mdwn2
-rw-r--r--wiki/src/install/linux/usb.pt.po6
-rw-r--r--wiki/src/install/os.de.po4
-rw-r--r--wiki/src/install/os.fa.po4
-rw-r--r--wiki/src/install/os.fr.po4
-rw-r--r--wiki/src/install/os.html2
-rw-r--r--wiki/src/install/os.pt.po4
-rw-r--r--wiki/src/lib/go-down.pngbin0 -> 253 bytes
-rw-r--r--wiki/src/lib/list-add.pngbin0 -> 167 bytes
-rw-r--r--wiki/src/lib/media-playback-start.pngbin0 -> 246 bytes
-rw-r--r--wiki/src/lib/menu.png (renamed from wiki/src/doc/anonymous_internet/icedove/menu.png)bin329 -> 289 bytes
-rw-r--r--wiki/src/lib/open-menu.pngbin0 -> 181 bytes
-rw-r--r--wiki/src/lib/system-run.pngbin0 -> 514 bytes
-rw-r--r--wiki/src/lib/unlock.pngbin0 -> 281 bytes
-rw-r--r--wiki/src/news/report_2015_08.de.po328
-rw-r--r--wiki/src/news/report_2015_08.fa.po328
-rw-r--r--wiki/src/news/report_2015_08.fr.po328
-rw-r--r--wiki/src/news/report_2015_08.mdwn (renamed from wiki/src/blueprint/report_2015_08.mdwn)48
-rw-r--r--wiki/src/news/report_2015_08.pt.po328
-rw-r--r--wiki/src/news/signing_key_transition.de.po9
-rw-r--r--wiki/src/news/signing_key_transition.fa.po94
-rw-r--r--wiki/src/news/signing_key_transition.fr.po19
-rw-r--r--wiki/src/news/signing_key_transition.mdwn7
-rw-r--r--wiki/src/news/signing_key_transition.pt.po9
-rw-r--r--wiki/src/news/version_1.5.de.po25
-rw-r--r--wiki/src/news/version_1.5.fa.po25
-rw-r--r--wiki/src/news/version_1.5.fr.po25
-rw-r--r--wiki/src/news/version_1.5.mdwn4
-rw-r--r--wiki/src/news/version_1.5.pt.po25
-rw-r--r--wiki/src/news/version_2.0.de.po78
-rw-r--r--wiki/src/news/version_2.0.fa.po8
-rw-r--r--wiki/src/news/version_2.0.fr.po8
-rw-r--r--wiki/src/news/version_2.0.mdwn2
-rw-r--r--wiki/src/news/version_2.0.pt.po8
-rw-r--r--wiki/src/press/media_appearances_2016.de.po23
-rw-r--r--wiki/src/press/media_appearances_2016.fa.po23
-rw-r--r--wiki/src/press/media_appearances_2016.fr.po23
-rw-r--r--wiki/src/press/media_appearances_2016.mdwn7
-rw-r--r--wiki/src/press/media_appearances_2016.pt.po23
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.2.de.po42
-rw-r--r--wiki/src/support/known_issues.de.po127
-rw-r--r--wiki/src/support/known_issues.fa.po217
-rw-r--r--wiki/src/support/known_issues.fr.po203
-rw-r--r--wiki/src/support/known_issues.mdwn68
-rw-r--r--wiki/src/support/known_issues.pt.po151
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml.pgp16
245 files changed, 8694 insertions, 4864 deletions
diff --git a/wiki/src/blueprint/Linux_containers.mdwn b/wiki/src/blueprint/Linux_containers.mdwn
index e961ad9..73913ce 100644
--- a/wiki/src/blueprint/Linux_containers.mdwn
+++ b/wiki/src/blueprint/Linux_containers.mdwn
@@ -111,6 +111,7 @@ Running GUI applications in containers
* [GNOME sandboxed
applications](https://wiki.gnome.org/Projects/SandboxedApps), aka.
`xdg-app`; their concept of "portals" is very interesting.
+ - [GNOME Developer Experience hackfest: xdg-app + Debian](http://smcv.pseudorandom.co.uk/2016/xdg-app/)
* <http://pleonasm.info/blog/2012/10/privilege-separation-with-xpra/>
* [docker-desktop](https://github.com/rogaha/docker-desktop)
* Stéphane Graber's [LXC 1.0 blog post
diff --git a/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn b/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
index a018dcc..1e8c405 100644
--- a/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
+++ b/wiki/src/blueprint/Port_Tails_Installer_to_Windows.mdwn
@@ -1,3 +1,97 @@
+[[!toc levels=1]]
+
+# Linux dependencies
+
+The current Tails Installer version (<https://git-tails.immerda.ch/liveusb-creator/>)
+has considerable changes when compared with the upstream Fedora liveusb-creator
+(<https://git.fedorahosted.org/cgit/liveusb-creator.git>).
+
+The current package dependencies for the Tails Installer in Linux are:
+
+* dosfstools
+* gdisk
+* genisoimage
+* gir1.2-glib-2.0
+* gir1.2-gtk-3.0
+* gir1.2-udisks-2.0
+* mtools
+* p7zip-full
+* policykit-1
+* python-configobj
+* python-gi
+* python-urlgrabber
+* syslinux
+
+If we list the set of requirements for each important source file then we have:
+
+### \_\_init\_\_.py
+
+ import gettext
+
+ if sys.platform == 'win32':
+ import gettext_windows
+ gettext_windows.setup_env()
+
+### creator.py
+
+ if 'linux' in sys.platform:
+ import gi
+ gi.require_version('UDisks', '2.0')
+ from gi.repository import UDisks, GLib
+
+ Commands:
+ * syslinux
+ * sgdisk
+ * dd
+ * dosfslabel
+ * e2label
+ * extlinux
+ * pkexec
+ * mkdiskimage
+ * sync
+
+### gui.py
+
+ from gi.repository import Gdk, GLib, Gtk
+ urlgrabber
+
+ In general GTK3
+
+### launcher.py
+
+ from gi.repository import Gtk
+
+### utils.py
+
+ if 'linux' in sys.platform:
+ from gi.repository import GLib
+
+# Alternatives for Windows:
+
+If we make a diff of the Windows class section in the "creator.py" source file,
+comparing the current Tails version and the upstream version like this:
+
+ git difftool remotes/origin/master:tails_installer/creator.py remotes/b/master:liveusb/creator.py
+
+we can see that the changes are not so big, at least in the raw Windows tools used.
+These tools are basically, the Python win32 interfaces:
+
+ import win32file, win32api, pywintypes
+
+and set of third parties tools listed here:
+
+<https://git-tails.immerda.ch/liveusb-creator/tree/tools>
+
+There are other tools that would be possible to explore like:
+<https://labs.riseup.net/code/issues/10984>
+
+As a conclusion, the biggest difference in the current Tails version is the usage
+of the Python interface for GTK3 (PyGI). The tools/libraries for Windows used in
+the current upstream liveusb-creator version seem in principle like the same
+used for Tails right now, except for the GUI parts.
+In the next section a proposed solution for porting applications using this library
+for Windows is described.
+
# PyGI windows executable
I managed to create a native windows executable for a test Python/GI program under Windows 8.1
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
index 1696182..cb25b2a 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
@@ -46,15 +46,83 @@ Everything in this report can be made public.
This is not a security problem in Tails since we drop non-Tor
traffic by default, but for this very reason in breaks the
functionality of the autoconfig wizard in the context of Tails.
- We started to write a proof-of-concept patch to fix this bug.
+ We started to write a proof-of-concept patch to fix this bug which
+ will be submitted upstream in February.
+
+ In order to improve Icedove's security in Tails and avoid unforeseen exploits,
+ we started evaluating an AppArmor profile for Icedove ([[!tails_ticket 10750]]).
+ We've asked the author to submit it upstream where it's now waiting to be merged.
+ In the meantime, we will ship this profile in Tails on our own.
+
+## A.1.6. Release Icedove in Tails
+
+ Icedove was made the default email client in Tails 1.8 (December 15)
+ and Claws Mail was removed from Tails in version 2.0 (January 26).
# B. Improve our quality assurance process
+## B.1. Automatically build ISO images for all the branches of our source code that are under active development
+
+In January, **757 ISO images** were automatically built by our Jenkins
+instance.
+
+We worked on designing and implementing a workaround for an issue in our
+autobuild setup: it sometimes happens that a build fails and leaves its
+temporary directories. The subsequent builds happening on the same
+system then always fail as they lack room in the /tmp/ directory.
+([[!tails_ticket 10772]])
+
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
+
+In January, **757 ISO images** were tested by our Jenkins instance.
+
+## B.3. Extend the coverage of our test suite
+
+* B.3.11. Fix newly identified issues to make our test suite more robust and faster
+
+ - We've marked some more scenarios as fragile, as we noticed there
+ were still some false positives ([[!tails_ticket 10863]]):
+ Encrypting and signing a message using an OpenPGP key
+ ([[!tails_ticket 10991]])
+ OpenPGP applet key selection window badly handled
+ ([[!tails_ticket 10992]])
+ Viewing and printing a PDF file ([[!tails_ticket 10994]])
+
# C. Scale our infrastructure
+## C.2. Be able to detect within hours failures and malfunction on our services
+
+We're still working on the prototype and it now has a setup for all the
+checks we ranked in the blueprint as critical. ([[!tails_ticket 8650]])
+
+This helped us to check how the chosen software is corresponding to the
+requirements we defined. An implementation has been proposed.
+([[!tails_ticket 8645]])
+
+## C.4. Maintain our already existing services
+
+We kept on answering the requests from the community as well as taking
+care of security updates as covered by "C.4.4. Administer our services
+up to milestone IV" and "C.4.5. Administer our services up to milestone
+V" until the end of January.
+
+A design to administer our new monitoring machine with puppet has been
+proposed. ([[!tails_ticket 10760]])
+
# D. Migration to Debian Jessie
+## D.4.1. Document the changes implied by the move to Jessie on our website
+
+ Most of our documentation has been updated to Jessie. For example we
+ rewrote entirely the [[introduction to
+ GNOME|doc/first_steps/introduction_to_gnome_and_the_tails_desktop]].
+ While reworking these pages we also simplified and improved some of
+ the oldest parts of our documentation.
+
+ The update of our documentation to GNOME Disks 3.12 was drafted but
+ not merged yet. The good news is that this process involves new
+ contributors who wrote documentation for Tails for the first time.
# E. Release management
diff --git a/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn b/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn
deleted file mode 100644
index 26ed5ef..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to the tails-greeter GSoC'2011 project's blog!
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn b/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn
deleted file mode 100644
index 3f003c2..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-### Update:
-
-Build takes ages, spits several errors like:
-
-"ERROR: ld.so: object '/usr/lib/libeatmydata/libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored"
-
-but successfully produce .iso
-
-#### Current status:
-back on track.
-
-#### Near-future plans:
-whine until I have access to build-server more powerful than my ancient laptop :-)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn
deleted file mode 100644
index 620179c..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta date="Mon May 9 02:02:02 2011"]]
-
-This is the 1st in a series of bi-weekly reports which will follow alongside the implementation of tails-greeter project.
-
-#### Current progress:
-
-- created design document as subpage for TailsGreeter on wiki
-- tried building tails iso
-
-#### Problems:
-
-- build fails with various problems on different machines
-- build requires root privileges (upstream problem with live-build, see http://live.debian.net/devel/live-build/todo/ entries for "core")
-
-#### Near-future plans:
-
-- investigate and fix abovementioned problems
-- read on .deb packaging
-- read on vala (development environment setup and code samples)
-
-#### Additional notes:
-
-This entry will serve as a small test for unicode support of ikiwiki as well - see the numbering in heading :)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn
deleted file mode 100644
index 8028822..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-[[!meta date="Fri Jul 29 02:02:02 2011"]]
-
-## Current progress:
-
-- verify that locale is correctly applied to gnome-session and fix if it isn't - DONE.
-- fix layout widget loading - DONE.
-- obtain list of kb layouts and variants available (via python-xklavier) - postponed.
-- populate layout widget with kb variants - postponed.
-- apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session) - postponed.
-- verify that layout switching works after login - postponed.
-- Add option to skip all the greeter screens and immediately login with default settings - DONE.
-- Convey necessary env. variables to gnome session.(echo "VARIABLE=value" >> /etc/amnesia/environment or via /etc/gdm3/PostLogin/)
-- capitalize 1st letter of (latin) language names (e. g. English vs english) - DONE.
-- version tag and update - DONE.
-
-
-## Problems:
-
-- ISP failure which caused lack of regular updates and report delay
-- it's impossible to set env. vars via /etc/gdm3/PostLogin/ - it's writable by root only and greeter is running as 'gdm-user' account
-- python-xklavier bindings are incomplete: the most needed function "search_by_pattern" is unavailable.
-
-
-## Near-future plans:
-
-- find a way to overcome python-xklavier limitations
-- Next week plans.
-
-## Additional notes:
-
-- Right now layout widget is dummmy: only "next" button is working.
-- The language choice is applied to session semi-correctly: if there are several country locales correspond to one language (for examle French is Belgium, France etc) than one of them is picked seemingly random. Once there is workaround for xklavier issue than it'll be user choice made based on layout widget.
-
-
-
-
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn
deleted file mode 100644
index 9e72411..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-[[!meta date="Fri Aug 5 02:02:02 2011"]]
-
-## Current progress:
-
-- obtain list of kb layouts and variants available (via python-xklavier) - DONE.
-- populate layout widget with kb variants - DONE.
-- merge feature/better_root_access_control branch - DONE.
-- apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session) - postponed.
-- verify that layout switching works after login - postponed
-- version tag and update - DONE.
-
-## Problems:
-
-- tails-greeter is run under gdm's account but altering gdm PostLogon files (to set env variables) or locale compilation via localedef require root privileges.
-- xklavier set and check layout without errors but it doesn't affect greeter nor following session.
-- better_root_access_control feature requires env. variable to be set which is not possible yet.
-
-## Near-future plans:
-
-- wait for answer from gdm and xklavier devs to figure out workarounds for current problems
-- replace 2 widgets with 1 panel with same functionality
-- test the result with tails
-
-## Additional notes:
-
-- right now there are 2 "screens" which user moves through by pressing "next" button. That's rather ugly and is planned to be replaced with one of the following:
-
-
-1) single "screen" with requests for both at the same time
-
-2) 2 "screens" with language and layout requests on first one and admin password request on second one
-
-- Which do you think is better and why?
-- Please feel free to discuss it on irc this Saturday during regular meeting time or whenever you'll see max-gsoc
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn
deleted file mode 100644
index e2a7066..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-## Current progress:
-
-0. write password for config/chroot_local-includes/usr/local/sbin/set-user-password
-to file - DONE.
-0. alter set-user-password to use password from file - DONE.
-0. merge language and layout widget to single panel - DONE.
-0. write locale name for localedef to file - DONE.
-0. add locale generator which uses data from file - DONE.
-0. fix layout selection for greeter session - DONE.
-0. add double password entry to prevent typos - DONE.
-0. use SelectLayout in GDM - DONE.
-0. add layout selection to panel - DONE.
-0. use separate layouts for greeter and for user session - DONE.
-0. display panel and password widget on the same screen - DONE.
-0. add layout indicator to greeter - DONE.
-0. properly generate list of available layouts - in progress
-0. version tag and update - DONE.
-
-
-## Problems:
-
-Generation of layout list based on language or locale is incomplete - it works only
-for some well-tested cases (e. g. Русский). More testing required for other languages
-and general code refactoring needed as well.
-
-## Near-future plans:
-
-0. Finish layout generation code.
-0. Update documentation.
-0. Other plans from timeline.
-
-## Additional notes:
-
-Please test how it works for YOUR favorite language.
-The GSoC is almost over - next week is the time for final wrap-ups.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn
deleted file mode 100644
index 639d09a..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-## Current progress
-
-0. refactor layout generation code - DONE.
-0. disable admin rights for empty password - DONE.
-0. add layout variant selection - DONE.
-0. use selected variant for greeter and session layout - DONE.
-0. add variant to layout indicator - DONE.
-0. make session layout selection enforce greeter layout selection - DONE.
-0. make session layout variant selection enforce greeter layout variant selection - DONE.
-0. make sure panel width fits the screen - DONE.
-0. pre-select locale based on language - DONE.
-0. correct UI phrasing - DONE.
-0. show country name instead of code (e. g. Russia vs. ru_RU) - DONE.
-0. update translation instructions - DONE.
-0. add ability to use any layout regardless of language\locale choice - postponed
-0. fix entry field width - postponed
-0. fix polkit & sudo configuration - testing required
-0. test with TAILS VM - in progress
-0. document latest design changes - in progress
-0. version tag and update - DONE.
-
-## Problems
-
-0. Glade seems pretty counter-intuitive: it's unclear how to make gtk window (parent) auto-resize when it's content (gtk entry inside gtk table) have expanded.
-0. Proposed addition to add selection of any layout will require list which is even bigger than language list (which is currently considered unusable due to its size) - it's unclear how to do it right in UI. Addition is justified by following use-case example: Italian speaking person running TAILS on computer with Norwegian kb layout and would like to have Italian locale but Norwegian layout to match hardware at hands.
-0. Hardcoded username and password prevent using tails-greeter 2nd time. Switch to gdm's autologin functionality is required.
-
-## Next week plans
-
-0. Document all the known issues. Create pages according to bug-reporting guideline.
-0. Try to fix some of them.
-0. Consume questionable substances - celebrate GSoC completion.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn
deleted file mode 100644
index d9ceeee..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta date="Mon May 23 02:02:02 2011"]]
-
-## Current progress
-
-- git repositories ready (or, frankly, I feel ready to use them :)
-- tried debian packaging and it seems to work ("seems" because it's readily available packages, not my own code yet)
-- found example dbus implementation of greeter interface in python:
-<http://doctormo.org/2011/04/12/how-to-make-a-gnome-login-screen-in-python/>
-- walked through vala code samples for dbus & GUI
-
-## Problems
-
-- university workload increased, will post corresponding changes to schedule soon
-- GDM's interfaces are not so well documented
-
-## Near-future plans
-
-- official coding start
-- pick build system (scons? cmake? autotools?), in a mean time will use plain old makefile
-- iron-out workflow (code, test, commit, build, report sequence)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn
deleted file mode 100644
index f722e95..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta date="Fri Jun 3 02:02:02 2011"]]
-
-## Current progress
-
-- project language switch vala -> python
-- main reason: working example made in python dy doctormo
-- big repo update: with 'upstream' branch for doctormo's code and 'master' branch for actual development
-
-## Problems
-
-- scm conversion with 'taylor' failed so dumb import of entire bzr tree is performed
-- university workload spike started earlier than anticipated
-
-## Near-future plans
-
-- mange university workload
-- make .deb for doctormo's code
-- integrate .deb building with git
-
-## Note:
-
-Next week will be mostly dedicated to exam, presentation and other university activities - hence tiny plans for it.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn
deleted file mode 100644
index e7537cb..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta date="Mon Jun 13 02:02:02 2011"]]
-
-## Current progress
-
-- mostly work on university projects so minor fixes and updates only
-- weekly meeting follow-up - multiple wiki updates
-- review existing python code & glade interfaces
-- gdm-community-greeter forked into tails-greeter
-- filed RFP for gtkme [[http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629199]] - dependency for tails-greeter
-- pbuilder fix: git-buildpackage successfully builds from 'master' granch
-- run community-greeter in VM: partially done - see below
-
-## Problems
-
-- installation into debian-squeeze is fine but got runtime error due to old python-gobject package, no backports found so .deb changed to prevent installation with unsopported version
-- check with debian-sid - installation is fine after dependency correction for gir1.0-gtk-2.0 -> gir1.2-gtk-2.0 but autostart failed for unknown reason
-
-## Near-future plans
-
-- complete VM testing
-- play with d-feet dbus debugger
-- alter python code with dummy 'admin password requestor'
-- check if current localization handling is suitable for tails-greeter
-- make plans for next week
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn
deleted file mode 100644
index a9c839b..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta date="Mon Jun 20 02:02:02 2011"]]
-
-## Current progress
-
-- convert tails-greeter to old-style pygtk to remove pygi dependecy: [in progress]
-- re-test converted version with squeeze: [done, test failed]
-- check if current localization handling is suitable for tails-greeter: [postponed]
-- make plans for next week: [done]
-
-## Problems
-
-- proper procedure for version increase
-- errors with dbus after conversion: access-denied on dbus call
-- dpkg-divert required for proper testing
-- need easy way to run python syntax quick check on entire file
-
-## Near-future plans
-
-- add dpkg-divert functionality to .deb
-- fix errors found after conversion
-- run external (placeholder) program with adequate parameters on language change (locale generation for example)
-- alter python code with dummy 'admin password requestor'
-- add tails-greeter.deb into tails.git (main) repo
-- add note that it's dangerous to install tails-greeter.deb :)
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn
deleted file mode 100644
index 8e1fc68..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!meta date="Fri Jun 24 02:02:02 2011"]]
-
-## Current progress
-
-
-0. fix errors reported by pylint - DONE (some errors still there).
-0. bump version properly (git push --tags; git-dch --git-author) - DONE.
-0. add pylint conf to ignore dbus-related false positives - DONE (might hide real errors too).
-0. fix language selector so it's shown and work properly - DONE (.po translations are incomplete).
-0. check if current localization handling is suitable for tails-greeter - DONE (seems ok if locales are known at the time of package build).
-0. run external (placeholder) program with adequate parameters on language change (locale generation for example) - POSTPONED.
-0. wiki updates (testing instructions and overall status) - DONE.
-0. lintian tails-greeter.deb (using .changes file too) - DONE (no errors reported).
-0. make login possible - IN_PROGRESS.
-0. add .deb into tails repo - BLOCKED by previous item.
-0. make .iso build (if packages testing-ready) - BLOCKED by previous item.
-
-## Problems
-
-BeginAutoLogin works as expected but interfacing with existing GdmGreeter to send it at the right moment seems trick.
-Documentation complete absent so will have to talk directly with the developer about it.
-
-## Near-future plans
-
-0. relocation to another country
-0. fixes\updates\minor items which were postponed for whatever reason
-
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn
deleted file mode 100644
index 456839e..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta date="Tue Jun 28 02:02:02 2011"]]
-
-## Current progress
-
-0. change widget to fit many more languages: from flag icons to scrollable list - partially done (dummy widget only, no python code yet).
-0. make .iso build - not done.
-0. specify dbus interface to interact with external locale-gen script - not done (see 'Problems' below).
-0. change widget exec order (parallel->sequential) to comply with "localization notes" part of [[todo/TailsGreeter/design]] - not done (see 'Problems' below).
-
-## Problems
-
-0. relocation to another country.
-0. .iso build fails due to problems with underlying fs, fix testing is in progress.
-0. the widget exec order is hardcoded into community-greeter.py so this change requires more time than it was anticipated during previous planning.
-0. interaction with locale-gen script require rewrite of the d-bus code in services.py which cannot be completed during this week as well.
-
-## Near-future plans
-
-0. rewrite d-bus handling in service.py
-0. change widget exec order (rewrite community-greeter.py)
-0. substitute LanguageWindow widget with LangselectWindow
-0. setup squid-deb-proxy to speed-up live-build
-0. remainder of week #6 plans from [[todo/TailsGreeter/timeline]]
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn
deleted file mode 100644
index 6664e75..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Fri Jul 8 02:02:02 2011"]]
-
-## Current progress
-
-0. [Mon.] change widget exec order (parallel->sequential) to comply with "localization notes" part of [[todo/TailsGreeter/design]] - DONE.
-0. [Mon.] setup squid-deb-proxy - DONE.
-0. [Mon.] make .iso build - DONE.
-0. [Tue.] change widget to fit many more languages: from flag icons to scrollable list - DONE.
-0. [Wed.] (re)generate .po with (dummy) translations (to show that language change is actually working) - DONE.
-0. [Wed.] populate the list of supported languages in the widget from gnome-desktop-data package languages or dpkg-reconfigure locales (see gdm_get_all_language_names function for example) - DONE (with external helper script).
-0. [Thu.] 'subprocess': run external (locale-gen) program with adequate parameters on language change and wait for its completion before allowing logon - in progress.
-0. update tails-greeter.deb package - in progress.
-0. propose rough plans / estimates for all the remaining weeks - postponed.
-
-## Problems
-
-0. Current implementation uses gtk's ComboBox for the list of languages. Switching to scrollable list (similar to debian-installer) might require to scale better to bigger number of languages but it will take a bit more efforts to integrate it with gtkme wrapper.
-0. Pygtk functions for window.show() and window.hide() do not work as expected - sometimes window which supposed to be hidden remain visible despite successful gtk property change. Right now the workaround is to call window.destroy() however this might not scale that well if we will have multiple windows with complex interactions in between in future. To summarize: worth investigating but not top priority at the moment.
-0. Right now language list is presented to user based on the locales available in the system (e. g. those chosen via 'dpkg-reconfigure locales' for example). Those might be unsupported by available tails-greeter translations. And vice-versa: there might be tails-greeter translation which doesn't correspond to any system locale. Those situations got to be carefully tested and handled gracefully.
-0. Current implementation uses subprocess' calls to run locale generation from autologin widget - it should be moved to upper layer - to the greeter itself: it will be easier to incorporate other widgets this way.
-0. There are several ways to obtain list of supported locales in gdm/gui/simple-greeter/gdm-languages.c (including locale.alias file, gdm's locale-archive and system-wide locale-archive). Similar logic should be incorporated into tails-greeter. It's worth investigating if it's feasible to engage gdm code using ctypes for example.
-
-## Near-future plans
-
-0. Complete .iso build and tests, push new tails-greeter.deb if the tests are successful.
-0. Investigate things listed in 'problems' section above
-0. Implement plans for next week #7
-
-## Additional notes
-
-0. Right now language choice is applied only after user have pressed 'forward' button - it would look nicer if it's done immediately upon selection.
-0. Language list should contain language's own name (e. g. 'Русский' for 'Russian') instead of current 2-letter code.
-
-Those should be included into plans for some of the upcoming weeks.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn
deleted file mode 100644
index d2a194c..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Fri Jul 15 02:02:02 2011"]]
-
-## Current progress
-
-
-0. populate language list using list of available locales in /usr/share/i18n/SUPPORTED - DONE.
-0. supply parameter as 'en' (or smth else suitable for locale generation - investigate) to locale-gen - DONE.
-0. Language list should contain language's own name (e. g. 'Русский' for 'Russian')
-instead of current 2-letter code - DONE.
-0. translate language widget too (move lang choice handler from button_clicked to list_choice)
-0. Move locale-gen interaction to greeter from widget - DONE.
-0. cleanup commented\old\dead code - DONE.
-0. obtain list of kb layouts available (via python-xklavier)
-0. use existing code/UI from d-i/anaconda/ubuntu installer/ for language chooser if possible - partially done (PyICU utilized).
-0. apply correct layout after it's been chosen (both to present and following greeter widgets and to actual session)
-
-## Problems
-
-0. Some of the 'native' language names are not displayed correctly due to missing characters in the fonts (standard unicode squares shown instead). It's unclear how to filter them out because there are no actual errors shown in python.
-0. The language list is fairly long: maybe some of the exotic languages could be filtered or black-listed before list population?
-0. It's yet unclear how to pass information to the session initiated by gdm: especially how to set env. variable and apply language & layout settings - probably there are some dbus hooks available.
-0. xklavier and ICU seems like the right way to work with language and layout data but there is no obvious way to reuse code from installers (anaconda, d-i) directly.
-
-## Near-future plans
-
-0. Make widget for layout choice and populate it with data obtained via xklavier.
-0. Create version suitable for .iso build and test.
-0. Next week plans.
-
-## Additional notes
-
-0. Part of the code has been merged back to gdm-community-greeter project via special branch.
-0. The issue with wrongly displayed language names might be related to legacy (non-utf8) encodings. Right now there is no special treatment for those encodings. It's unclear whether some support required in tails-greeter for that at all.
-0. The general 'id' for the locale looks like ru_RU (language-country code) - see 'man localedef'. What's the acceptable id for layout is still unclear.
diff --git a/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn b/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn
deleted file mode 100644
index 7064fd4..0000000
--- a/wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-[[!meta date="Wed Jul 20 02:02:02 2011"]]
-
-## Current progress
-
-0. document interface to locale-gen - DONE.
-0. make sure it's possible to choose language multiple times before 'forward' button pressed - DONE.
-0. apply chosen language to gnome session - needs testing
-0. borrow ubiquity widgets for keyboard layout if possible - DONE.
-0. create keyboard layout widget - in progress.
-0. update requestor widget to hide password while typing - DONE.
-0. [Convert packages to dh_python2](http://wiki.debian.org/Python/TransitionToDHPython2) because python-support is deprecated - merge dh_python2 branch - DONE.
-0. pressing 'enter' in password request widget should be equal to button click - DONE.
-0. version tag and update - DONE.
-
-## Problems
-
-0. What's the best way to check that chosen language was actually applied to gnome session in Debian? 1) dpkg-reconfigure locales 2) choose supported locale 3) ??? are there some packages got to be installed? some env vars set? what should change as a result of proper language choice?
-In short - test-case description is missing.
-0. Layout widget borrowed from ubiquity fails with error:
-AttributeError: 'gtk.VBox' object has no attribute 'present'
-if loaded.
-This is in the code path inherited from gdm-community-greeter - the debugging is in progress.
-
-## Near-future plans
-
-0. Fix bugs preventing layout widget from loading and connect it with "real" python code talking to xklavier instead of stubs.
-0. week #9 plans.
-
-## Additional notes
-
-0. From now on till the end of GSoC every week new version will be tagged in git repo - this should aid with testing.
-0. This week is one day shorter due to wedding. Luckily - not my own :)
-0. For the same reason weekly meeting is moved to one day earlier.
-
diff --git a/wiki/src/blueprint/bootstrapping/verification.mdwn b/wiki/src/blueprint/bootstrapping/verification.mdwn
index 35f0edb..f8b7eca 100644
--- a/wiki/src/blueprint/bootstrapping/verification.mdwn
+++ b/wiki/src/blueprint/bootstrapping/verification.mdwn
@@ -1,5 +1,7 @@
[[!meta title="ISO verification"]]
+[[!toc]]
+
Vision
======
diff --git a/wiki/src/blueprint/follow_parts_of_Redmine.mdwn b/wiki/src/blueprint/follow_parts_of_Redmine.mdwn
new file mode 100644
index 0000000..e743879
--- /dev/null
+++ b/wiki/src/blueprint/follow_parts_of_Redmine.mdwn
@@ -0,0 +1,15 @@
+[Some of us need](https://mailman.boum.org/pipermail/tails-dev/2016-February/010204.html)
+to follow subsets of the changes made in our Redmine, without
+following _everything_.
+
+# Brainstorming
+
+## Criteria
+
+* Category
+* Type of work
+* Affected tool
+
+## Notification
+
+* email notifications work fine
diff --git a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
index 7e63961..cf213aa 100644
--- a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
+++ b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
@@ -1,50 +1,97 @@
+This is about [[!tails_ticket 11009]] and related tickets.
+
+[[!toc levels=2]]
+
Rationale
=========
In [[!tails_ticket 9264]], we're discussing and drafting our needs for more
isotesters. From some statistics of the number of automated builds per month,
we concluded we need to be able to run at least 1000 more test suites per
-month, which means being able to host at least 8 more isotesters.
+month.
-Note: our workload parallelizes poorly over multiple CPU cores, so
-perhaps getting _less_ additional ISO testers, but each with faster
-CPU clock, would be more efficient.
+Note: our workload parallelizes poorly over multiple CPU cores per ISO tester,
+so we need to get more ISO testers and/or ISO testers with faster CPU clock.
Estimates
=========
-As a reminder, we are discussing in [[!tails_ticket 10396]] that one
-isotester means:
+As a reminder, one isotester means:
- * 20G RAM
+ * at least 20 GiB RAM, preferably 23 GiB
* 25G HDD (10G system+data, 15G tmp)
* 3 CPU threads
-So 8 isotesters would mean:
+On [[!tails_ticket 9264]] we concluded that we want to be able to run the test
+suite 1350 times per month. Each of our current isotesters on lizard v2 can run
+it about 120 times a month. We have four such VMs => we can already cope with
+480 times a month => we need to find out how to run it 1350 - 480 = 870 more
+times a month.
+
+# Upgrading lizard v2
+
+We are seriously under-using lizard v2's CPU power. Let's try to fix this in
+a way that solves at least part of the performance problems we currently have:
+[[!tails_ticket 9264]] and [[!tails_ticket 10999]].
+
+Experiments conducted on [[!tails_ticket 10996]] showed that we can probably
+run the test suite 25-35% more times on lizard, if we gave it 49 GiB more RAM
+and run 6 isotesters with 23 GiB RAM each. This brings us to something between
+480 * 1.25 = 600 and 480 * 1.35 = 648 runs a month. It might be that we can even
+run 8 isotesters efficiently, given 95 GiB more RAM than we currently have, but
+let's not count on it.
+
+This still covers only about half of our needs. So we'll need a second machine
+to host more ISO testers at some point: see below.
+
+Also, as seen on [[!tails_ticket 10999]], we could make use of more
+ISO builders, and here again, lizard could cope with this workload if we gave it
+18 more GiB of RAM.
+
+So, giving lizard 48+18 = 66 or 95+18 = 113 GiB more RAM would fix part of the
+problems we currently have, use more of our currently available computing power
+(which would be satisfying in itself), and teach us lots of things about how to
+set up and optimize systems to cope with our ISO testing workload.
- * 160G RAM
- * 200G HDD
- * 24 CPU threads max
+IMO (intrigeri) this would allow us to more cleverly pick hardware for the
+second ISO testing machine when we come to it. I think we should go with the
+higher option (which means upgrading to 256 GiB of RAM), that gives us more
+flexibility to experiment with various numbers of ISO builders and testers, and
+worst case RAM would always be useful for running more services we're asked to
+set up, and for improving performance thanks to disk caches.
-From there, it seems unlikely we could host that on Lizard, and we are
-back on the research about new hardware for isotesters.
+# A second machine
-Hardware
-========
+**Note**: IMO (intrigeri) we should experiment on lizard with more RAM
+before we make the final decision here, but this should not block us from
+drafting possible solutions :)
-Given the amount of RAM and CPUs required, it seems close to [[Lizard's
-specs|blueprint/hardware_for_automated_tests]].
+For reference, see [[lizard's specs|blueprint/hardware_for_automated_tests]].
-We still need to decide if we would use faster (as in Ghz) CPUs than the one
-Lizard has (Low voltages versions). In this case the price jumps quite a bit,
-and the electic bill will too (120W each for that kind of CPUs, against the 65W
-each of Lizard's ones).
+Assuming we have upgraded lizard as explained above, we need a second machine
+able to run the test suite about 700-750 times a month. If each ISO tester on
+that second machine was exactly as fast as those we have on lizard, then we
+would need 6 ISO testers on the new machine. But it's not a given: we can
+probably get faster ISO testers on the new machine; how many ISO testers it will
+run, and how many CPU cores and how much RAM it needs, depends on how fast each
+CPU core is. Economically speaking, faster CPU cores can save money on RAM
+(because we can achieve the same throughput with fewer ISO testers), but they
+cost more in electricity.
-The following price estimations are based on interpromicro.com ones.
+The following price estimates are based on <http://interpromicro.com/> ones.
## Candidate options
-We currently prefer option C if it's doable, and option D otherwise.
+**Note**: the following selection of candidates is outdated, as it doesn't take
+into account the most recent developments on this topic (see above). E.g. 4-6
+new ISO testers will probably be enough, and in turn we may be instead looking
+for something like:
+
+* 128 GiB of RAM (ideally we would just reuse the 128 GiB we have in lizard v2)
+* 12-18 CPU threads == 6-9 CPU cores
+
+Other than that, we currently prefer option C if it's doable, and option
+D otherwise.
<a id="option_C"></a>
@@ -112,23 +159,3 @@ Total --- **$6200**
* 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
Total --- **$6650**
-
-## Ways to lower the price a bit
-
-No need to invest time into it immediately, but if we eventually decide
-to go this way and the total price is a bit too high, we should look
-into these options.
-
-### Less RAM
-
-Here, we pay for the test suite's temporary storage twice: once in RAM
-(disk cache managed by the kernel), once on disk. We could cut down on
-costs a bit by not buying all the corresponding RAM now, and instead
-relying purely on the SSDs (buy 128GB instead of 256GB for the new
-machine, which saves ~$1k).
-
-I'm curious what would be the performance hit if we did that. I guess
-it's easy enough to get a first very rough estimate (just give an
-isotesterN 10GB of RAM instead of 20GB, or something), but really it all
-depends on how the drives handle _multiple_ instances of the test suite
-writing/reading tons of data.
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 24da338..4de79c5 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -1,5 +1,86 @@
[[!toc levels=2]]
+#Proposta prime Branch
+Sono 8!
+
+doc_about
+
+./doc/about
+./doc/about/features
+./doc/about/fingerprint
+./doc/about.index
+./doc/about/license
+./doc/about/openpgp_keys
+./doc/about/requirements
+./doc/about/tor
+./doc/about/trust
+./doc/about/warning
+
+doc_first_step_ABIM
+
+./doc/first_steps
+./doc/first_steps/accessibility
+./doc/first_steps/bug_reporting
+./doc/first_steps/bug_reporting/tails_does_not_start
+./doc/first_steps.index
+./doc/first_steps/introduction_to_gnome_and_the_tails_desktop
+./doc/first_steps/media
+
+doc_installation
+
+./doc/first_steps/installation
+./doc/first_steps/installation/manual
+./doc/first_steps/installation/manual.intro
+./doc/first_steps/installation/manual/linux
+./doc/first_steps/installation/manual/mac
+./doc/first_steps/installation/manual/windows
+
+doc_persistence
+
+./doc/first_steps/persistence
+./doc/first_steps/persistence.caution
+./doc/first_steps/persistence/configure
+./doc/first_steps/persistence/delete
+./doc/first_steps/persistence/use
+./doc/first_steps/persistence/warnings
+
+doc_first_step_start
+
+./doc/first_steps/start_tails
+./doc/first_steps/startup_options
+./doc/first_steps/startup_options/administration_password
+./doc/first_steps/startup_options/bridge_mode
+./doc/first_steps/startup_options/mac_spoofing
+./doc/first_steps/startup_options/network_configuration
+
+doc_first_step_RUS
+
+./doc/first_steps/reset
+./doc/first_steps/reset.intro
+./doc/first_steps/reset/linux
+./doc/first_steps/reset/windows
+./doc/first_steps/upgrade
+./doc/first_steps/shutdown
+
+
+doc_get
+
+./doc/get.index
+./doc/get/trusting_tails_signing_key
+./doc/get/verify_the_iso_image_using_gnome
+./doc/get/verify_the_iso_image_using_other_operating_systems
+./doc/get/verify_the_iso_image_using_the_command_line
+
+first_level
+
+./download
+./getting_started
+./index
+./sidebar
+./support
+./about
+./doc
+
# Dizionario
<http://tp.linux.it/glossario.html>
@@ -376,3 +457,23 @@ Igni
./doc/first_steps/persistence/warnings --FINITO!
________________________________________
+
+Zeyev
+
+./doc/about/license --FINITO
+
+./doc/about/requirements --FINITO
+
+./doc/get.index --FINITO
+
+./doc/get/trusting_tails_signing_key --FINITO
+
+./doc/get/verify_the_iso_image_using_gnome --FINITO
+
+./doc/get/verify_the_iso_image_using_other_operating_systems --FINITO
+
+./doc/get/verify_the_iso_image_using_the_command_line --FINITO
+
+./download.it.po --FINITO
+
+________________________________________
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index b304e41..f2d0166 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -15,4 +15,7 @@ Availability and plans for the next weeks
Discussions
===========
+- [[!tails_ticket 11027 desc="Decide what to do with the old OpenPGP verification instructions"]]
- [[!tails_ticket 10781 desc="Investigate how to support the download of ISO images from release candidates"]]
+- [[!tails_ticket 11047 desc="Decide how to handle the upcoming monthly reports"]]
+- [[!tails_ticket 10915 desc="Consider publishing torrents for betas and RCs"]]
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
new file mode 100644
index 0000000..d405965
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -0,0 +1,15 @@
+[[!meta title="Monthly reports"]]
+
+[[!map pages="blueprint/monthly_report/*" show="title"]]
+
+This page could be a good place to gather HOWTO, tips, template, etc.
+for the monthly reports.
+
+- Check the archives of:
+ - <https://mailman.boum.org/pipermail/tails-dev/>
+ - <https://mailman.boum.org/pipermail/tails-ux/>
+ - <https://mailman.boum.org/pipermail/tails-project/>
+- Explore the Git history:
+ - git log --since="January 1" --until="February 1"
+- Redmine view of closed issues:
+ - https://labs.riseup.net/code/projects/tails/issues?utf8=%E2%9C%93&set_filter=1&f[]=closed_on&op[closed_on]=%3E%3C&v[closed_on][]=2016-01-01&v[closed_on][]=2016-01-31&f[]=&c[]=tracker&c[]=status&c[]=priority&c[]=subject&c[]=author&c[]=assigned_to&c[]=updated_on&c[]=cf_9&group_by=
diff --git a/wiki/src/blueprint/monthly_report/report_2015_12.mdwn b/wiki/src/blueprint/monthly_report/report_2015_12.mdwn
new file mode 100644
index 0000000..42c47ef
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2015_12.mdwn
@@ -0,0 +1,113 @@
+[[!meta title="Tails report from September to December 2015"]]
+
+It's been a pretty long time since the last report. We were
+quite busy and didn't find the time to write our monthly reports since August 2015.
+This report will covers the last third of 2015.
+
+Releases
+========
+
+* [[Tails 1.6 was released on September 22, 2015.|news/version_1.6]] (major release)
+
+* [[Tails 1.7 was released on November 3, 2015.|news/version_1.7]] (major release)
+
+* [[Tails 1.8 was released on December 15, 2015.|news/version_1.8]] (major release)
+
+* [[Tails 1.8.1 was released on December 19, 2015.|news/version_1.8.1]] (minor release)
+
+Code
+====
+
+For details, see each release announcement. Notable changes include:
+
+* 1.7: You can now start Tails in [[offline mode|doc/first_steps/startup_options/offline_mode]]
+ to disable all networking for additional security. Doing so can be
+ useful when working on sensitive documents.
+
+* 1.8: <span class="application">[[Icedove|doc/anonymous_internet/icedove]]</span>, a
+ rebranded version of <span class="application">Mozilla Thunderbird</span> is,
+ now the official email client in Tails, replacing
+ <span class="application">Claws Mail</span>.
+ As with Claws, Icedove allows you to encrypt and decrypt emails easily and sends all
+ traffic through the Tor network.
+
+Infrastructure
+==============
+
+ - We were able to deploy automated tests of ISO images built
+ automatically for our main release branches in the beginning of
+ October.
+
+ - The new snapshot system improved robustness of our test suite
+ noticeably, and reduced the amount of time needed for a full run
+ with at least 30%.
+
+User experience
+===============
+
+ - Alan wrote a prototype for a new version of Tails Greeter and we
+ [conducted user testing](https://mailman.boum.org/pipermail/tails-ux/2015-November/000791.html) of it.
+
+ - Lunar started a discussion on [redesigning the process to connect to a
+ network and configure Tor](https://mailman.boum.org/pipermail/tails-ux/2015-October/000659.html).
+
+ - sajolida proposed some improvements to WhisperBack regarding [language
+ flagging and OpenPGP keys](https://mailman.boum.org/pipermail/tails-ux/2015-November/000801.html).
+
+Documentation and website
+=========================
+
+- We published our [[Installation Assistant|install]] to make it easier
+ to get started with Tails.
+
+- Giorgio Maone wrote a [Firefox add-on](https://addons.mozilla.org/en-US/firefox/addon/tails-download-and-verify/?src=search)
+ to verify the Tails ISO image automatically.
+
+- We published a statement [[about creating Tails derivatives|contribute/derivatives]].
+
+Website
+=======
+
+* The Tails website is now available in [Farsi](https://tails.boum.org/index.fa.html). Thanks to all Farsi translators and the [LocalizationLab](http://localizationlab.org).
+
+Outreach
+========
+
+* Syl held a Tails Workshop at Bazar du Libre on November 22 in Toulouse, France.
+
+* We had a table at 32C3, in Hamburg, Germany.
+
+Press and Testimonials
+======================
+
+* 2015-09-24: [Open Source Privacy: Tails OS Issues Security Fixes and New Release](http://thevarguy.com/open-source-application-software-companies/092415/open-source-privacy-tails-os-issues-security-fixes-and-ne) by Christopher Tozzi on The VAR Guy.
+
+* 2015-10-05: [Be completely anonymous online](http://www.postandcourier.com/article/20151005/PC05/151009881/1002/be-completely-anonymous-online) by Kim Komando in The Post and Courier.
+
+Metrics
+=======
+
+In September 2015:
+
+* Tails has been started more than 473,295 times in September. This makes 15,268 boots a day on average.
+* 29,135 downloads of the OpenPGP signature of Tails ISO from our website.
+* 90 bug reports were received through WhisperBack.
+
+In October 2015:
+
+* Tails has been started more than 500,551 times in October. This makes 16,147 boots a day on average.
+* 25,790 downloads of the OpenPGP signature of Tails ISO from our website.
+* 71 bug reports were received through WhisperBack.
+
+In November 2015:
+
+* Tails has been started more than 540,362 times in November. This makes 18,012 boots a day on average.
+* 34,881 downloads of the OpenPGP signature of Tails ISO from our website.
+* 95 bug reports were received through WhisperBack.
+
+In December 2015:
+
+* Tails has been started more than 546,366 times in December. This makes 17,6245 boots a day on average.
+* 35,853 downloads of the OpenPGP signature of Tails ISO from our website.
+* 109 bug reports were received through WhisperBack.
+* sajolida published statistics on [the time before upgrade](https://mailman.boum.org/pipermail/tails-dev/2015-November/009803.html)
diff --git a/wiki/src/blueprint/monthly_report/report_2016_01.mdwn b/wiki/src/blueprint/monthly_report/report_2016_01.mdwn
new file mode 100644
index 0000000..0979d81
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_01.mdwn
@@ -0,0 +1,109 @@
+[[!meta title="Tails report for January, 2016"]]
+
+January has been a busy month with two releases including Tails 2.0.
+
+[[!toc]]
+
+Releases
+========
+
+* [[Tails 1.8.2 was released on January 10, 2016|news/version_1.8.2]] (minor release).
+
+* [[Tails 2.0 was released on January 26, 2016|news/version_2.0]] (major release).
+
+* The next release (2.2) is [[planned for March 08|https://tails.boum.org/contribute/calendar/]].
+
+The following changes were introduced in Tails 2.0:
+
+[[!inline pages="inc/release_notes/2.0" raw="yes"]]
+
+Code
+====
+
+- Andrew Gallagher wrote a [tool to clone and backup the persistent
+ volume](https://mailman.boum.org/pipermail/tails-dev/2016-January/010033.html). Testing is welcome!
+
+- Christian Medel is working on a [replacement for the defunct Windows
+ Camouflage](https://mailman.boum.org/pipermail/tails-dev/2016-January/010084.html).
+
+Documentation and website
+=========================
+
+- Most of our documentation was updated to Tails based on Jessie.
+
+User experience
+===============
+
+* Tails Installer is now available in [Debian](https://tracker.debian.org/pkg/tails-installer)
+ and [Ubuntu](https://launchpad.net/~tails-team/+archive/ubuntu/tails-installer)
+
+Infrastructure
+==============
+
+* Our test suite covers 208 scenarios, 17 more than in August.
+
+Outreach
+========
+
+* A Tails install party took place in Toulouse, France to celebrate the Tails 2.0 release.
+
+Upcoming events
+---------------
+
+* We will participate at the [Internet Freedom Festival](https://internetfreedomfestival.org/)
+ in Valencia, Spain from 1st-6th March 2016.
+
+* We will be at the [Logan CIJ Symposium "Challenge Power"](http://logancij.com),
+ 11-12th March 2016 in Berlin, Germany.
+
+On-going discussions
+====================
+
+* sycamoreone started started working on a [blueprint](https://tails.boum.org/blueprint/replace_Pidgin/) to find a suitable replacement for Pidgin in the future.
+
+* A discussion about [persistent Tor state](https://tails.boum.org/blueprint/persistent_Tor_state/) has been relaunched.
+
+Press and testimonials
+======================
+
+* 2016-01: Several articles cover the release of Tails 2.0:
+ - 2016-01-27: [Tails 2.0: Das Anonymisierungs-OS im neuen Look](http://www.heise.de/security/meldung/Tails-2-0-Das-Anonymisierungs-OS-im-neuen-Look-3085312.html) by Fabian A. Scherschel in heise (in German).
+ - 2016-01-27: [Edward Snowden's OS of choice gets a major update](http://www.engadget.com/2016/01/27/edward-snowdens-os-of-choice-gets-a-major-update/) by Steve Dent in engadget.
+
+* 2016-01-12: Tails is listed as best distro for privacy in [The Best
+ Linux Distros of 2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/)
+ by Swapnil Bhartiya in Linux.com.
+
+* 2016-01-07: [Tails - Soukromí pro každého - kdekoliv a kdykoliv](http://valeas.cz/it-blog/117-tails-soukromi-pro-kazdeho-kdekoliv-a-kdykoliv) by Václav in Valeas blog (in Czech).
+
+Translation
+===========
+
+Due to the Jessie release, a lot of our translated documentation is now outdated.
+
+All website PO files
+--------------------
+
+ - de: 28% (2236) strings translated, 2% strings fuzzy, 24% words translated
+ - fa: 60% (4855) strings translated, 3% strings fuzzy, 69% words translated
+ - fr: 41% (3301) strings translated, 3% strings fuzzy, 40% words translated
+ - pt: 21% (1669) strings translated, 4% strings fuzzy, 19% words translated
+
+Total original words: 86910
+
+[[Core PO files|contribute/l10n_tricks/core_po_files.txt]]
+--------------------------------------
+
+ - de: 90% (1202) strings translated, 7% strings fuzzy, 88% words translated
+ - fa: 83% (1109) strings translated, 11% strings fuzzy, 76% words translated
+ - fr: 84% (1125) strings translated, 9% strings fuzzy, 79% words translated
+ - pt: 73% (982) strings translated, 16% strings fuzzy, 70% words translated
+
+Total original words: 14326
+
+Metrics
+=======
+
+* Tails has been started more than 571,109 times this month. This makes 18,423 boots a day on average.
+* 39,080 downloads of the OpenPGP signature of Tails ISO from our website.
+* 184 bug reports were received through WhisperBack.
diff --git a/wiki/src/blueprint/monthly_report/report_2016_02.mdwn b/wiki/src/blueprint/monthly_report/report_2016_02.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_02.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_03.mdwn b/wiki/src/blueprint/monthly_report/report_2016_03.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_03.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_04.mdwn b/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
diff --git a/wiki/src/blueprint/monthly_report/report_2016_05.mdwn b/wiki/src/blueprint/monthly_report/report_2016_05.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2016_05.mdwn
diff --git a/wiki/src/blueprint/report_2015_09.mdwn b/wiki/src/blueprint/report_2015_09.mdwn
deleted file mode 100644
index 246813a..0000000
--- a/wiki/src/blueprint/report_2015_09.mdwn
+++ /dev/null
@@ -1,96 +0,0 @@
-[[!meta title="Tails report for September, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.6 was released on September 22, 2015|news/version_1.6]] (minor release).
-
-* The next release (1.7) is [[planned for November 11|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more that in April.
- - at the beginning of September: 191
- - at the end of September: 185 (FIXME: ask the developers why if
- needed, after checking the SponsorR and SponsorS reports)
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-There will be a Tails and Tor workshop to the [Capitole du libre](https://2015.capitoledulibre.org) in Toulouse (France) on November 22nd.
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-* 2015-09-24: [Open Source Privacy: Tails OS Issues Security Fixes and New Release](http://thevarguy.com/open-source-application-software-companies/092415/open-source-privacy-tails-os-issues-security-fixes-and-ne) by Christopher Tozzi on The VAR Guy.
-
-Translation
-===========
-
-FIXME
-
-At the end of the month:
-
-All website PO files
-
- - de: 19% (1283) strings translated, 0% strings fuzzy, 18% words translated
- - fr: 46% (3120) strings translated, 2% strings fuzzy, 43% words translated
- - pt: 27% (1863) strings translated, 3% strings fuzzy, 26% words translated
-
-Total original words: 76959
-
-[[Core PO files|contribute/l10n_tricks/core_po_files.txt]]
-
- - de: 60% (803) strings translated, 0% strings fuzzy, 68% words translated
- - fr: 92% (1214) strings translated, 3% strings fuzzy, 92% words translated
- - pt: 84% (1119) strings translated, 8% strings fuzzy, 87% words translated
-
-Total original words: 14258
-
-Metrics
-=======
-
-* Tails has been started more than 473.295 times this month. This makes 15.776 boots a day on average.
-
-* 29.135 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_10.mdwn b/wiki/src/blueprint/report_2015_10.mdwn
deleted file mode 100644
index f8c5f7f..0000000
--- a/wiki/src/blueprint/report_2015_10.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-[[!meta title="Tails report for October, 2015"]]
-
-FIXME Edito
-
-No release this month. The next release (1.7) is [[planned for November 11|https://tails.boum.org/contribute/calendar/]].
-
-[[!toc]]
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-There will be a Tails and Tor workshop to the [Capitole du libre](https://2015.capitoledulibre.org) in Toulouse (France) on November 22nd.
-
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-2015-10-05: [Be completely anonymous online](http://www.postandcourier.com/article/20151005/PC05/151009881/1002/be-completely-anonymous-online) by Kim Komando in The Post and Courier.
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 500,551 times this month. This makes 16,147 boots a day on average.
-
-* 25,790 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_11.mdwn b/wiki/src/blueprint/report_2015_11.mdwn
deleted file mode 100644
index 109b036..0000000
--- a/wiki/src/blueprint/report_2015_11.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta title="Tails report for November, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.7 was released on November 11, 2015|news/version_1.7]] (major release).
-
-* The next release (1.8) is [[planned for December 15|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 540,362 times this month. This makes 18,012 boots a day on average.
-
-* 34,881 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_12.mdwn b/wiki/src/blueprint/report_2015_12.mdwn
deleted file mode 100644
index d65850f..0000000
--- a/wiki/src/blueprint/report_2015_12.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta title="Tails report for December, 2015"]]
-
-FIXME Edito
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails 1.8 was released on December 15, 2015|news/version_1.8]] (minor release).
-
-* The next release (2.0) is [[planned for January 26|https://tails.boum.org/contribute/calendar/]].
-
-Code
-====
-
-FIXME
-
-Documentation and website
-=========================
-
-FIXME
-
-User experience
-===============
-
-FIXME
-
-Infrastructure
-==============
-
-* Our test suite covers FIXME scenarios, FIXME more than in April.
-
-* FIXME more?
-
-Funding
-=======
-
-FIXME
-
-Outreach
-========
-
-FIXME
-
-Upcoming events
----------------
-
-FIXME
-
-On-going discussions
-====================
-
-FIXME
-
-Press and testimonials
-======================
-
-FIXME
-
-Translation
-===========
-
-FIXME
-
-Metrics
-=======
-
-* Tails has been started more than 546366 times this month. This makes 17625 boots a day on average.
-
-* 35853 downloads of the OpenPGP signature of Tails ISO from our website.
-
-* FIXME bug reports were received through WhisperBack.
-
--- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/website_homepage.mdwn b/wiki/src/blueprint/website_homepage.mdwn
index 67cf19c..b0ea127 100644
--- a/wiki/src/blueprint/website_homepage.mdwn
+++ b/wiki/src/blueprint/website_homepage.mdwn
@@ -23,7 +23,7 @@ Notes taken during the Summit 2014.
- Key tools
- Encrypted storage and configuration (only when you want it) : persistence
- Secure instant messaging : Pidgin + OTR
- - Encrypted emails : Claws + GPG
+ - Encrypted emails : Icedove + GPG
- Anonymous browsing : Torbrowser
- Censorship circumvention
- Windows camouflage
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index af492d4..9a9db9e 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -505,10 +505,6 @@ msgid ""
msgstr "[[Treffen|contribute/meetings]] und Protokolle vergangener Treffen"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index 2b5b789..7857d96 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -490,10 +490,6 @@ msgid ""
msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr "[[contribute/Low-hanging_fruit_sessions]]"
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
@@ -541,3 +537,6 @@ msgstr "با ما تماس بگیرید\n"
#, no-wrap
msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
+
+#~ msgid "[[contribute/Low-hanging_fruit_sessions]]"
+#~ msgstr "[[contribute/Low-hanging_fruit_sessions]]"
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index e985122..148a353 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -459,10 +459,6 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index ab60d7d..a227496 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -168,7 +168,6 @@ Collective process
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- [[Code of conduct|contribute/working_together/code_of_conduct]]
- [[Contributors meetings|contribute/meetings]], and minutes from past meetings
- - [[contribute/Low-hanging_fruit_sessions]]
- [[Marking a task as easy|contribute/working_together/criteria_for_easy_tasks]]
- [[Document progress|contribute/working_together/document_progress]]
- Roles
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 92b5bd5..18ecc3e 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:20+0100\n"
+"POT-Creation-Date: 2016-02-01 15:51+0100\n"
"PO-Revision-Date: 2014-05-23 14:56-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -508,10 +508,6 @@ msgid ""
msgstr "[[Reuniões|contribute/meetings]], e notas de reuniões passadas"
#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid ""
"[[Marking a task as easy|contribute/working_together/"
"criteria_for_easy_tasks]]"
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 0b49f7c..2cf99d2 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,31 +1,17 @@
[[!meta title="Calendar"]]
-* 2016-01-11:
- - Build and upload Tails 2.0~rc1.
- - Start testing Tails 2.0~rc1 during late CET if building the image
- went smoothly.
+* 2016-03-08: Release 2.2
-* 2016-01-12:
- - Finish testing Tails 2.0~rc1 by the afternoon, CET.
- - Release Tails 2.0~rc1.
+* 2016-04-19: Release 2.3
-* 2016-01-25:
- - The upcoming Tor Browser is hopefully out so we can import it.
- - Build and upload Tails 2.0 ISO image and IUKs.
- - Start testing Tails 2.0 during late CET if building the image
- went smoothly.
+* 2016-06-07: Release 2.4 (Firefox 45.2)
-* 2016-01-26:
- - Finish testing Tails 2.0 by the afternoon, CET.
- - Release Tails 2.0 during late CET, earliest when Mozilla
- publishes their MFSAs.
+* 2016-08-02: Release 2.5 (Firefox 45.3)
-* 2016-03-08 (?): Release 2.2
+* 2016-09-13: Release 2.6 (Firefox 45.4)
-* 2016-04-19 (?): Release 2.3
+* 2016-11-08: Release 2.7 (Firefox 45.5)
-* 2016-05-31 (?): Release 2.4
+* 2016-12-13: Release 2.8 (Firefox 45.5.1)
-* 2016-07-12 (?): Release 2.5
-
-* 2016-08-23 (?): Release 2.6
+* 2017-01-24: Release 2.9 (Firefox 45.6)
diff --git a/wiki/src/contribute/chat.mdwn b/wiki/src/contribute/chat.mdwn
index bbc3099..71ed65e 100644
--- a/wiki/src/contribute/chat.mdwn
+++ b/wiki/src/contribute/chat.mdwn
@@ -1,15 +1,15 @@
-[[!meta title="Development chat"]]
+[[!meta title="Contributors chat"]]
In addition to the [[#tails general chatroom|support/chat]],
-we have a dedicated chatroom for development.
+we have a dedicated chatroom for contributors.
-To join it, use your preferred instant messaging client, e.g.
+To join it, use your preferred instant messaging client that supports XMPP, e.g.
[[Pidgin|http://www.pidgin.im/]], which runs on Windows, GNU/Linux and
Mac OS X.
Here are the needed technical details:
-* server: `irc.oftc.net`
-* port: `6697`
-* channel: `#tails-dev`
+* protocol: XMPP
+* server: `conference.riseup.net`
+* channel: `tails-dev`
* Use TLS/SSL to connect!
diff --git a/wiki/src/contribute/how/donate.de.po b/wiki/src/contribute/how/donate.de.po
index dad7cb5..24183da 100644
--- a/wiki/src/contribute/how/donate.de.po
+++ b/wiki/src/contribute/how/donate.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2015-12-31 13:49+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,6 +104,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.fa.po b/wiki/src/contribute/how/donate.fa.po
index 4b2bcb3..b34bded 100644
--- a/wiki/src/contribute/how/donate.fa.po
+++ b/wiki/src/contribute/how/donate.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,6 +86,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.fr.po b/wiki/src/contribute/how/donate.fr.po
index 65bbe6d..922ec51 100644
--- a/wiki/src/contribute/how/donate.fr.po
+++ b/wiki/src/contribute/how/donate.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2015-03-16 22:03+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -102,6 +102,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/donate.mdwn b/wiki/src/contribute/how/donate.mdwn
index 700abcc..10f10d7 100644
--- a/wiki/src/contribute/how/donate.mdwn
+++ b/wiki/src/contribute/how/donate.mdwn
@@ -29,6 +29,9 @@ Ways to donate
* [Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails.boum.org&title=Tails)
+ * For fundraising related matters, you can write
+ to <tails-fundraising@boum.org>.
+
* If none of these methods suit you, consider [donating
to the Tor Project](https://www.torproject.org/donate/). They do
great work, and also support us financially.
diff --git a/wiki/src/contribute/how/donate.pt.po b/wiki/src/contribute/how/donate.pt.po
index 8db8e5e..b830b4e 100644
--- a/wiki/src/contribute/how/donate.pt.po
+++ b/wiki/src/contribute/how/donate.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-30 15:53+0100\n"
+"POT-Creation-Date: 2016-02-01 19:35+0100\n"
"PO-Revision-Date: 2014-09-15 12:30-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,6 +96,12 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
+"For fundraising related matters, you can write to <tails-fundraising@boum."
+"org>."
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn
index cf504dc..55f46d4 100644
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -50,6 +50,7 @@ the rest of the website.
Currently, there are three active **language teams**:
+* [[Farsi|translate/team/fa]]
* [[French|translate/team/fr]]
* [[German|translate/team/de]]
* [[Portuguese|translate/team/pt]]
diff --git a/wiki/src/contribute/how/translate/team/fa.mdwn b/wiki/src/contribute/how/translate/team/fa.mdwn
new file mode 100644
index 0000000..8ed6d2d
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/fa.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="Translate Tails into Farsi"]]
+
+The Farsi translation team uses its [[own mailing
+list|https://mailman.boum.org/listinfo/tails-l10n-fa/]].
diff --git a/wiki/src/contribute/low-hanging_fruit_sessions.mdwn b/wiki/src/contribute/low-hanging_fruit_sessions.mdwn
deleted file mode 100644
index a3b780c..0000000
--- a/wiki/src/contribute/low-hanging_fruit_sessions.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta title="Low-hanging fruits sessions"]]
-
-Each month a low-hanging fruits session is organized. During these
-sessions, we spend some time together working on many small tasks that take less
-than two hours each.
-
-It currently happens on **twelfth day** of the month on
-[[#tails-dev|contribute/chat]] at 9pm CEST or CET (7pm or 8pm UTC).
-Everybody is welcome to attend, existing contributors and those who
-want to become one.
-
-The goals are to:
-
-* Bypass the somewhat cumbersome paperwork of the usual email-based
- [[review and merge process|contribute/merge_policy]]: during
- low-hanging fruits sessions, we exceptionally allow ourselves to go
- through it live on IRC.
-* Enjoy doing non-urgent things and have some fun together.
-* Get a lot of small improvements into the next Tails release.
-* Cleanup our todo list a bit.
-* Try to handle bug fixes for the next release that are not assigned to
- anybody.
diff --git a/wiki/src/contribute/meetings.mdwn b/wiki/src/contribute/meetings.mdwn
index 4ed8132..1fa9529 100644
--- a/wiki/src/contribute/meetings.mdwn
+++ b/wiki/src/contribute/meetings.mdwn
@@ -3,7 +3,7 @@
[[!toc]]
Each month a contributors meeting is organized. It currently happens
-on **third day** of the month on [[#tails-dev|contribute/chat]] at
+on **third day** of the month on the [[tails-dev chatroom|contribute/chat]] at
9pm CEST or CET (7pm or 8pm UTC). Everybody is welcome to attend, existing
contributors and those who want to become one.
@@ -22,10 +22,8 @@ yourself during the meeting, and be sure to tell us what you are
interested in.
The meeting might not be the most adequate time and place to properly
-introduce newcomers to the development process
-([[contribute/low-hanging_fruit_sessions]] are more appropriate), but
-at least it should be a fine place to know each others, and schedule
-a better suited event.
+introduce newcomers to the development process, but at least it should
+be a fine place to know each others, and schedule a better suited event.
# Instructions for taking notes
diff --git a/wiki/src/contribute/meetings/201602.mdwn b/wiki/src/contribute/meetings/201602.mdwn
new file mode 100644
index 0000000..fb292e5
--- /dev/null
+++ b/wiki/src/contribute/meetings/201602.mdwn
@@ -0,0 +1,62 @@
+[[!meta title="February 2016 online meeting"]]
+
+[[!toc levels=1]]
+
+# Introduction
+
+We do a bit more free form and skip topics for which people not here today
+have a strong opinion (or might have one), because we're mostly new contributors.
+So we skip "Hole in the roof" which are hard and boring.
+
+# Important tickets flagged for next release but without assignee
+
+ - [[!tails_ticket 11048 desc="Permanently remove the rest of the keyboard layout"]] and
+ [[!tails_ticket 11044 desc="PXE Boot support"]] not triaged yet
+
+ - segfault will look at
+ [[!tails_ticket 11031 desc="Open URL feature of KeepassX doesn't work anymore"]] which
+ seems to be fixed by installing gnome-open
+
+ - [[!tails_ticket 10765 desc="Allow pinning certificates in Icedove"]] will be postponed,
+ as it is a new feature (no bugfix, no regression, etc.) and noone present wants to dig
+ into it at the moment
+
+ - [[!tails_ticket 7496 desc="Make it possible to verify the integrity of a device created
+ by Tails Installer"]] segfault will write a mail to the list about this, we leave the
+ ticket open for the rms
+
+ - [[!tails_ticket 11000 desc="The Tor Browser's font fingerprinting protection does not
+ work in Tails" is already "Fix committed"
+
+ - [[!tails_ticket 9844]] didn't find an assignee
+ - For [[!tails_ticket 9949 desc="Audit AppArmor policy vs. hard links"]],
+ intrigeri who has followed it has been pinged for status or ETA update.
+
+# Availability and plans until the next meeting
+
+ - sycamore will write down some stuff about entropy
+ - muri is still working on the l10 screenshot automation
+ - muri also plans to take another look at weblate
+ - spriver would like to start to translate the installation assistant
+ - segfault wants to rethink the installation and upgrade process
+
+
+# [[!tails_ticket 9555 desc="Include a pinentry GUI that's well integrated within GNOME"]]
+
+upgrading pinentry-gtk2 from 0.8.3-2 to 0.9.7-1 improves things and using pinentry-gnome3
+would make things worse, at least for keepassx users. segfault will submit a branch that
+upgrades pinentry-gtk2 to 0.9.7-1
+
+# [[!tails_ticket 10913 desc="Keyboard layout keyboard shortcut has changed"]]
+
+Right-now there as three keyboard shortcuts to change keyboard layout:
+
+ - Super+Space which is provided by GNOME.
+ - Shift+Shift which is custom to Tails (added in e492749). segfault
+ will see whether we should get rid of this one as well.
+ - Alt+Shift which is custom to Tails (added in 370f48c). Saying that
+ this is the default in Windows might have been an ok argument at some point.
+
+Seeing that [[!tails_ticket 11042 desc="alt + shift switch the keyboard layout
+without indicating it in the keyboard layout menu"]], GNOME is giving it a different meaning
+by default: Alt+Shift shortcut will be removed. segfault will submit a branch.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 75b9274..03b16d7 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -1020,7 +1020,8 @@ Prepare for the next release
XXX: adapt / fork for release candidates. In the meantime, read all
this, and skip what does not make sense for a RC.
-1. Move the previous stable release to `obsolete` on the mirrors.
+1. If you just released a new stable release, remove the previous
+ stable release on the mirrors.
1. Remove any remaining RC for the just-published release from
the mirrors.
1. Remove IUKs that are more than 6 months old from
@@ -1055,11 +1056,16 @@ this, and skip what does not make sense for a RC.
--repo "$bare_repo" && \
rm -rf "$bare_repo"
+1. Remove all old versions in `wiki/src/upgrade/v1/Tails` that were
+ never released. Explanation: the post-release APT repository steps
+ from the previous stable release will usually have had us prepare
+ for an emergency release that was never made.
1. Pull `master` back and merge it into `stable`, and in turn into
`devel`, `experimental` and `feature/jessie`.
1. Follow the
[[post-release|contribute/APT_repository#workflow-post-release]] APT
- repository documentation.
+ repository documentation. Make sure there are upgrade-description
+ files for any new versions that were added.
1. Push the resulting branches.
1. If this was a major release, then reset experimental:
- take note of branches merged into `experimental`, but not into
@@ -1083,10 +1089,6 @@ this, and skip what does not make sense for a RC.
1. Ensure the next few releases have their own _Release Manager View_.
1. On the [[!tails_roadmap]], update the *Due date* for the *Holes
in the Roof* so that this section appears after the next release.
-1. If the next release is a point-release, ask
- <tails-sysadmins@boum.org> to disable the Jenkins job that's
- building ISO images from the `testing` branch (since it basically
- won't be used/maintained in the next 2.5 months).
1. If you will be the release manager for the next release, look at the
tasks that must be done at the beginning of your shift in the
[[release manager role page|contribute/working_together/roles/release_manager]].
diff --git a/wiki/src/contribute/talk.html b/wiki/src/contribute/talk.html
index 649995e..e1d2d30 100644
--- a/wiki/src/contribute/talk.html
+++ b/wiki/src/contribute/talk.html
@@ -11,8 +11,9 @@
and headers reveal about yourself: location, IP address, etc.
</li>
<li>
- You can join our [[#tails|support/chat]] and
- [[#tails-dev|contribute/chat]] chatrooms; note: only a few
+ You can join our [[#tails|support/chat]] user support IRC chatroom,
+ or the tails-dev XMPP one (server: `conference.riseup.net`)
+ that is meant for discussion among contributors; note: only a few
Tails core developers hang out there, so email
is preferred for anything that might be of
interest for the larger Tails development community.
diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index 1eabf78..223583c 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,37 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr ""
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fa.po b/wiki/src/doc/anonymous_internet.index.fa.po
index 51ea311..4d56aa4 100644
--- a/wiki/src/doc/anonymous_internet.index.fa.po
+++ b/wiki/src/doc/anonymous_internet.index.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-25 17:46+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -19,44 +19,14 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.4-dev\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink ورود_به_پورتال‌های_کپتیو|anonymous_internet/unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
-"span>|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
-"anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -65,6 +35,37 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink ورود_به_پورتال‌های_کپتیو|anonymous_internet/unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
+#~ "anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
+
+#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
#~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#~ msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 1f70ba0..8c178b7 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -16,44 +16,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Se_connecter_au_réseau_avec_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
-"\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
+#| " - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+#| " - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
+#| " - [[!traillink Using_I2P|anonymous_internet/i2p]]\n"
+#| " - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -67,6 +43,36 @@ msgstr ""
" - [[!traillink Pourquoi_Tor_est-il_lent_?|anonymous_internet/why_tor_is_slow]]\n"
#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Se_connecter_au_réseau_avec_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
+#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
#~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#~ msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index 25651e9..ea1ccab 100644
--- a/wiki/src/doc/anonymous_internet.index.pt.po
+++ b/wiki/src/doc/anonymous_internet.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-05-23 13:58-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,49 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</span>|"
-"anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
-#| "tor_browser]]"
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
-"tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
@@ -65,6 +30,42 @@ msgid ""
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
+#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
+#~| "tor_browser]]"
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
+#~ "tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
#, fuzzy
#~| msgid ""
#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
index 628bfc5..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
index 63e05d2..7091f5e 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
@@ -2,26 +2,36 @@
[[!inline pages="doc/anonymous_internet/icedove/replacement.inline" raw="yes"]]
-<span class="application">Claws Mail</span> will be definitely removed
+<span class="application">Claws Mail</span> was removed
from Tails in version 2.0 (2016-01-26).
[[!inline pages="doc/anonymous_internet/icedove/name.inline" raw="yes"]]
-If you have been using <span class="application">Claws Mail</span> and activated its persistence feature,
-the following instructions explain how to migrate your data to <span class="application">Icedove</span>.
-
We recommend you do the migration before launching <span class="application">Icedove</span> for the first
time. You should, in this order:
[[!toc]]
+<a id="install"></a>
+
+Install <span class="application">Claws Mail</span>
+===================================================
+
+1. Start Tails and [[set up an administration password|first_steps/startup_options/administration_password]].
+
+1. Choose <span class="menuchoice"><span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Terminal</span></span> to open a terminal.
+
+1. Execute the following command to install <span class="application">Claws Mail</span>:
+
+ sudo apt install claws-mail
+
<a id="mailboxes"></a>
Copy your emails saved in the persistent storage
================================================
-1. Start Tails and [[set up an administration password|first_steps/startup_options/administration_password]].
-
1. Start <span class="application">Claws Mail</span>.
1. To know if you are using the IMAP or the POP protocol, choose <span class="menuchoice">
@@ -39,8 +49,8 @@ Copy your emails saved in the persistent storage
<span class="application">Claws Mail</span> to
<span class="application">Icedove</span>.
-1. Verify that both the <span class="application">Claws Mail</span> and
- <span class="application">Icedove</span> persistence features are
+1. Verify that the
+ <span class="application">Icedove</span> persistence feature is
activated. Otherwise, you might loose data.
1. The script only migrates the mailbox in
@@ -58,11 +68,7 @@ Copy your emails saved in the persistent storage
<span class="application">Claws Mail</span>, please move all your emails into
the one corresponding to <span class="filename">/home/amnesia/.claws-mail/Mail</span>.
-1. Choose <span class="menuchoice"><span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">Terminal</span></span> to open a terminal.
-
-1. Execute the following command to download the migration script:
+1. In the terminal, execute the following command to download the migration script:
wget https://tails.boum.org/misc/claws_to_icedove.sh
@@ -80,7 +86,7 @@ Copy your emails saved in the persistent storage
<li>In <span class="application">Icedove</span>, choose
<span class="menuchoice">
- <span class="guimenu">[[!img icedove/menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
<span class="guimenuitem">Account Settings</span></span>.</li>
@@ -138,7 +144,7 @@ Configure your email accounts in <span class="application">Icedove</span>
1. Choose
<span class="menuchoice">
- <span class="guimenu">[[!img icedove/menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
<span class="guimenuitem">Account Settings</span></span>.
@@ -213,20 +219,19 @@ To do so:
1. Choose <span class="menuchoice">
<span class="guimenu">Places</span>&nbsp;▸
- <span class="guimenuitem">Home Folder</span>
+ <span class="guimenuitem">Home</span>
</span> in the top navigation bar to open the file browser.
1. Choose <span class="menuchoice">
- <span class="guimenu">View</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/go-down.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
<span class="guimenuitem">Show Hidden Files</span></span>.
1. Open the <span class="guilabel">.claws-mail</span> folder.
1. Choose <span class="menuchoice">
- <span class="guimenu">Edit</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
<span class="guimenuitem">Select All</span></span>.
-1. Choose <span class="menuchoice">
- <span class="guimenu">Edit</span>&nbsp;▸
- <span class="guimenuitem">Wipe</span>
- </span> and confirm.
+1. Right-click, choose <span class="menuchoice">
+ <span class="guimenuitem">Wipe</span></span>,
+ and confirm.
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
index 086d3d7..966e15f 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Claws Mail</span> will be definitely removed\n"
+"<span class=\"application\">Claws Mail</span> was removed\n"
"from Tails in version 2.0 (2016-01-26).\n"
msgstr ""
@@ -41,25 +41,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you have been using <span class=\"application\">Claws Mail</span> and activated its persistence feature,\n"
-"the following instructions explain how to migrate your data to <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
"time. You should, in this order:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
+msgid "<a id=\"install\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
+msgid "Install <span class=\"application\">Claws Mail</span>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -69,6 +62,34 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
+msgid ""
+"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
+"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
+"\"guimenuitem\">Terminal</span></span> to open a terminal."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Execute the following command to install <span class=\"application\">Claws "
+"Mail</span>:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt install claws-mail\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mailboxes\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Copy your emails saved in the persistent storage\n"
+msgstr ""
+
+#. type: Bullet: '1. '
msgid "Start <span class=\"application\">Claws Mail</span>."
msgstr ""
@@ -97,9 +118,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Verify that both the <span class=\"application\">Claws Mail</span> and <span "
-"class=\"application\">Icedove</span> persistence features are activated. "
-"Otherwise, you might loose data."
+"Verify that the <span class=\"application\">Icedove</span> persistence "
+"feature is activated. Otherwise, you might loose data."
msgstr ""
#. type: Bullet: '1. '
@@ -132,13 +152,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Accessories</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to download the migration script:"
+"In the terminal, execute the following command to download the migration "
+"script:"
msgstr ""
#. type: Plain text
@@ -175,7 +190,7 @@ msgstr ""
msgid ""
" <li>In <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
msgstr ""
@@ -280,7 +295,7 @@ msgstr ""
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img icedove/menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
msgstr ""
@@ -428,7 +443,7 @@ msgstr ""
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home Folder</span>\n"
+" <span class=\"guimenuitem\">Home</span>\n"
" </span> in the top navigation bar to open the file browser.\n"
msgstr ""
@@ -436,7 +451,7 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
msgstr ""
@@ -448,15 +463,14 @@ msgstr ""
#, no-wrap
msgid ""
"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Select All</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Wipe</span>\n"
-" </span> and confirm.\n"
+"1. Right-click, choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenuitem\">Wipe</span></span>,\n"
+" and confirm.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.de.po b/wiki/src/doc/anonymous_internet/icedove.de.po
index b39330b..e6d0b14 100644
--- a/wiki/src/doc/anonymous_internet/icedove.de.po
+++ b/wiki/src/doc/anonymous_internet/icedove.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2016-01-24 11:31+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -119,12 +119,19 @@ msgstr ""
"um E-Mails mit OpenPGP zu verschlüsseln und authentifizieren.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
+#| "<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.fa.po b/wiki/src/doc/anonymous_internet/icedove.fa.po
index cfac680..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fa.po
+++ b/wiki/src/doc/anonymous_internet/icedove.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.fr.po b/wiki/src/doc/anonymous_internet/icedove.fr.po
index 113a0b8..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fr.po
+++ b/wiki/src/doc/anonymous_internet/icedove.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.mdwn b/wiki/src/doc/anonymous_internet/icedove.mdwn
index dbaeb1a..4b73444 100644
--- a/wiki/src/doc/anonymous_internet/icedove.mdwn
+++ b/wiki/src/doc/anonymous_internet/icedove.mdwn
@@ -44,7 +44,7 @@ extension to encrypt and authenticate emails using OpenPGP.
To configure <span class="application">Enigmail</span> for your email account, you can start the
<span class="application">Enigmail Setup Wizard</span> by choosing
<span class="menuchoice">
- <span class="guimenu">[[!img menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Enigmail</span>&nbsp;▸
<span class="guimenuitem">Setup Wizard</span></span>.
diff --git a/wiki/src/doc/anonymous_internet/icedove.pt.po b/wiki/src/doc/anonymous_internet/icedove.pt.po
index 113a0b8..0211f48 100644
--- a/wiki/src/doc/anonymous_internet/icedove.pt.po
+++ b/wiki/src/doc/anonymous_internet/icedove.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgid ""
"To configure <span class=\"application\">Enigmail</span> for your email account, you can start the\n"
"<span class=\"application\">Enigmail Setup Wizard</span> by choosing\n"
"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Enigmail</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Setup Wizard</span></span>.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
index 571d274..ef8fe4a 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
@@ -6,26 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-11-03 02:15+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2016-01-24 16:15+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.6\n"
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, an "
-"assistant appears to guide you through the process of configuring <span class="
-"\"application\">Icedove</span> to access your email account."
+"When starting <span class=\"application\">Icedove</span> for the first time, "
+"an assistant appears to guide you through the process of configuring <span "
+"class=\"application\">Icedove</span> to access your email account."
msgstr ""
-"Wenn <span class=\"application\">Icedove</span> zum ersten Mal gestartet wird, "
-"erscheint ein Assistent, um Sie durch den Vorgang der Konfiguration von <span "
-"class=\"application\">Icedove</span> zu führen, damit Sie auf Ihr E-Mailkonto "
-"zugreifen können."
+"Wenn <span class=\"application\">Icedove</span> zum ersten Mal gestartet "
+"wird, erscheint ein Assistent, um Sie durch den Vorgang der Konfiguration "
+"von <span class=\"application\">Icedove</span> zu führen, damit Sie auf Ihr "
+"E-Mailkonto zugreifen können."
#. type: Plain text
#, no-wrap
@@ -33,13 +33,25 @@ msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
msgstr " [[!img icedove/assistant.png link=\"no\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"tip\">\n"
+#| " <p>To start this assistant again in the future from the main window of\n"
+#| " <span class=\"application\">Icedove</span>, choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Account Settings</span>\n"
+#| " </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
+#| " dialog choose <span class=\"guilabel\">Account Actions</span>&nbsp;▸\n"
+#| " <span class=\"guilabel\">Add Mail Account&hellip;</span>.</p>\n"
+#| " </div>\n"
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
" <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span>\n"
" </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
@@ -60,7 +72,8 @@ msgstr ""
" </div>\n"
#. type: Bullet: '1. '
-msgid "Enter your name, email address, and password into the corresponding fields."
+msgid ""
+"Enter your name, email address, and password into the corresponding fields."
msgstr ""
"Geben Sie Ihren Namen, Ihre E-Mail-Adresse und Ihr Kennwort in die "
"entsprechenden Textfelder ein."
@@ -150,10 +163,14 @@ msgstr ""
" E-Mail-Kontos händisch zu beenden.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <p>We will enable again the automatic account configuration in Tails\n"
+#| " 2.0.</p>\n"
+#| " </div>\n"
msgid ""
" <p>We will enable again the automatic account configuration in Tails\n"
-" 2.0.</p>\n"
+" in the future. See [[!tails_ticket 6154]].</p>\n"
" </div>\n"
msgstr ""
" <p>Wir werden die automatische Konfiguration von Konten in Tails\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po
index ca38b43..90dc255 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-30 21:10+0000\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,19 +35,18 @@ msgid ""
" <p>To start this assistant again in the future from the main window of\n"
" <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic "
-"link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span>\n"
-" </span> and then from the <span class=\"guilabel\">Account "
-"Settings</span>\n"
+" </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
" dialog choose <span class=\"guilabel\">Account Actions</span>&nbsp;▸\n"
" <span class=\"guilabel\">Add Mail Account&hellip;</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Enter your name, email address, and password into the corresponding fields."
+msgid ""
+"Enter your name, email address, and password into the corresponding fields."
msgstr ""
#. type: Plain text
@@ -81,8 +80,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails "
-"that\n"
+" <span class=\"application\">Icedove</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
@@ -104,8 +102,7 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"bug\">\n"
-" <p>After this first screen, the <a "
-"href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
+" <p>After this first screen, the <a href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
" account configuration</a> of <span class=\"application\">Icedove</span>\n"
" is currently disabled in Tails for security reasons. You should consult\n"
" the documentation of your email provider to finish configuring your\n"
@@ -116,6 +113,6 @@ msgstr ""
#, no-wrap
msgid ""
" <p>We will enable again the automatic account configuration in Tails\n"
-" 2.0.</p>\n"
+" in the future. See [[!tails_ticket 6154]].</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po
index d325625..90dc255 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-03 02:15+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,19 +35,18 @@ msgid ""
" <p>To start this assistant again in the future from the main window of\n"
" <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic "
-"link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span>\n"
-" </span> and then from the <span class=\"guilabel\">Account "
-"Settings</span>\n"
+" </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
" dialog choose <span class=\"guilabel\">Account Actions</span>&nbsp;▸\n"
" <span class=\"guilabel\">Add Mail Account&hellip;</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Enter your name, email address, and password into the corresponding fields."
+msgid ""
+"Enter your name, email address, and password into the corresponding fields."
msgstr ""
#. type: Plain text
@@ -81,8 +80,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails "
-"that\n"
+" <span class=\"application\">Icedove</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
@@ -104,8 +102,7 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"bug\">\n"
-" <p>After this first screen, the <a "
-"href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
+" <p>After this first screen, the <a href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
" account configuration</a> of <span class=\"application\">Icedove</span>\n"
" is currently disabled in Tails for security reasons. You should consult\n"
" the documentation of your email provider to finish configuring your\n"
@@ -116,6 +113,6 @@ msgstr ""
#, no-wrap
msgid ""
" <p>We will enable again the automatic account configuration in Tails\n"
-" 2.0.</p>\n"
+" in the future. See [[!tails_ticket 6154]].</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
index f7058b6..0fef722 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
@@ -9,7 +9,7 @@
<p>To start this assistant again in the future from the main window of
<span class="application">Icedove</span>, choose
<span class="menuchoice">
- <span class="guimenu">[[!img menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
<span class="guimenuitem">Account Settings</span>
</span> and then from the <span class="guilabel">Account Settings</span>
@@ -53,5 +53,5 @@
email account manually.</p>
<p>We will enable again the automatic account configuration in Tails
- 2.0.</p>
+ in the future. See [[!tails_ticket 6154]].</p>
</div>
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po
index d325625..90dc255 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-03 02:15+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,19 +35,18 @@ msgid ""
" <p>To start this assistant again in the future from the main window of\n"
" <span class=\"application\">Icedove</span>, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic "
-"link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Account Settings</span>\n"
-" </span> and then from the <span class=\"guilabel\">Account "
-"Settings</span>\n"
+" </span> and then from the <span class=\"guilabel\">Account Settings</span>\n"
" dialog choose <span class=\"guilabel\">Account Actions</span>&nbsp;▸\n"
" <span class=\"guilabel\">Add Mail Account&hellip;</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Enter your name, email address, and password into the corresponding fields."
+msgid ""
+"Enter your name, email address, and password into the corresponding fields."
msgstr ""
#. type: Plain text
@@ -81,8 +80,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails "
-"that\n"
+" <span class=\"application\">Icedove</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
@@ -104,8 +102,7 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"bug\">\n"
-" <p>After this first screen, the <a "
-"href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
+" <p>After this first screen, the <a href=\"https://support.mozilla.org/en-US/kb/automatic-account-configuration\">automatic\n"
" account configuration</a> of <span class=\"application\">Icedove</span>\n"
" is currently disabled in Tails for security reasons. You should consult\n"
" the documentation of your email provider to finish configuring your\n"
@@ -116,6 +113,6 @@ msgstr ""
#, no-wrap
msgid ""
" <p>We will enable again the automatic account configuration in Tails\n"
-" 2.0.</p>\n"
+" in the future. See [[!tails_ticket 6154]].</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.de.po b/wiki/src/doc/anonymous_internet/networkmanager.de.po
index 9b51e09..db23d9d 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.de.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-05-30 22:42+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-30 22:40+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translations <tails-l10n@boum.org>\n"
@@ -17,67 +17,90 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Eine Netzwerkverbindung mit dem Netzwerk-Manager herstellen\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"Der <span class=\"application\">Netzwerk-Manager</span> erlaubt es Ihnen, sich kabelgebunden\n"
-"oder drahtlos (W-LAN, 3G oder GSM) mit einem Netzwerk zu verbinden:\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, <span class=\"application"
-"\">NetworkManager</span> automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, <span class=\"application"
+#| "\">NetworkManager</span> automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Wenn eine kabelgebundene Verbindung vorhanden ist, verbindet sich der <span "
"class=\"application\">Netzwerk-Manager</span> automatisch mit dieser."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the <span class=\"application"
-"\">NetworkManager Applet</span> to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
+"\">Select Network</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
msgstr ""
-"Um sich mit einem Drahtlosnetzwerk zu verbinden, klicken Sie auf das <span "
-"class=\"application\">Netzwerk-Manager-Applet</span> um die Liste der "
-"verfügbaren Verbindungen zu sehen. Wählen Sie anschließend die aus, mit der "
-"Sie sich verbinden möchten."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
msgid "After establishing a connection to a network:"
msgstr "Nachdem eine Verbindung mit einem Netzwerk hergestellt wurde:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+msgstr ""
+" a. Falls Sie bereits Internetzugriff haben, werden Tor und\n"
+" <span class=\"application\">[[Vidalia]]</span> automatisch gestartet.\n"
+" b. Falls Sie sich in ein Captive Portal einloggen müssen, bevor Ihnen Zugang\n"
+" zum Internet gewährt wird, [[lesen Sie die zugehörige Dokumentation|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -87,24 +110,30 @@ msgstr ""
" zum Internet gewährt wird, [[lesen Sie die zugehörige Dokumentation|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"<span class=\"application\">NetworkManager Applet</span>\n"
-"and choose <span class=\"guimenu\">Edit Connections...</span>\n"
-msgstr ""
-"Sie können die Einstellungen jeder einzelnen erfassten\n"
-"Netzwerkverbindung ändern (zum Beispiel um einzustellen,\n"
-"ob automatisch eine Verbindung zu einem W-LAN hergestellt werden soll).\n"
-"Um dies zu tun, klicken Sie mit der rechten Maustaste auf das <span class=\"application\">Netzwerk-Manager-Applet</span>\n"
-"und wählen Sie <span class=\"guimenu\">Verbindungen bearbeiten...</span> aus.\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose <span class=\"guilabel\">Network</span>."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -132,12 +161,22 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
+msgid "<p>It is currently impossible to connect using:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
msgid ""
"<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].</li>\n"
-"<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]</li>\n"
+"<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
@@ -153,12 +192,55 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
+#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgid ""
-"For more information about <span class=\"application\">NetworkManager</span>, open\n"
+"For more information, open\n"
"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgstr ""
"Für mehr Informationen über den <span class=\"application\">Netzwerk-Manager</span> öffnen\n"
"Sie bitte die <span class=\"application\">[[GNOME Hilfe|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"und wählen Sie <span class=\"guilabel\">Netzwerk, Web, E-Mail & Chat</span>.\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "Der <span class=\"application\">Netzwerk-Manager</span> erlaubt es Ihnen, sich kabelgebunden\n"
+#~ "oder drahtlos (W-LAN, 3G oder GSM) mit einem Netzwerk zu verbinden:\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the <span class="
+#~ "\"application\">NetworkManager Applet</span> to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Um sich mit einem Drahtlosnetzwerk zu verbinden, klicken Sie auf das "
+#~ "<span class=\"application\">Netzwerk-Manager-Applet</span> um die Liste "
+#~ "der verfügbaren Verbindungen zu sehen. Wählen Sie anschließend die aus, "
+#~ "mit der Sie sich verbinden möchten."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "<span class=\"application\">NetworkManager Applet</span>\n"
+#~ "and choose <span class=\"guimenu\">Edit Connections...</span>\n"
+#~ msgstr ""
+#~ "Sie können die Einstellungen jeder einzelnen erfassten\n"
+#~ "Netzwerkverbindung ändern (zum Beispiel um einzustellen,\n"
+#~ "ob automatisch eine Verbindung zu einem W-LAN hergestellt werden soll).\n"
+#~ "Um dies zu tun, klicken Sie mit der rechten Maustaste auf das <span class=\"application\">Netzwerk-Manager-Applet</span>\n"
+#~ "und wählen Sie <span class=\"guimenu\">Verbindungen bearbeiten...</span> aus.\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fa.po b/wiki/src/doc/anonymous_internet/networkmanager.fa.po
index fcdcf03..6b1bfd2 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fa.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fa.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-07-28 09:54+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-14 19:26+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian "
-"<http://weblate.451f.org:8889/projects/tails/networkmanager/fa/>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
+"networkmanager/fa/>\n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,135 +20,137 @@ msgstr ""
"X-Generator: Weblate 2.4-dev\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"متصل شدن به شبکه با استفاده از NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png "
-"link=no]]\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"idle.png link=no]]\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png "
-"link=no]]\n"
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, <span class=\"application"
+#| "\">NetworkManager</span> automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"wired.png link=no]]\n"
+"اگر یک اتصال باسیم شناسایی شود، <span class=\"application\">NetworkManager</"
+"span> به طور خودکار به آن متصل می‌شود."
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png "
-"link=no]]\n"
+#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"wireless.png link=no]]\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to "
-"a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
msgstr ""
-"ابزار <span class=\"application\">NetworkManager</span>\n"
-"به شما اجازه می‌دهد با کمک یک اتصال بی‌سیم (وای‌فای، ۳جی یا جی‌اس‌ام) یا "
-"باسیم به اینترنت وصل شوید:\n"
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
msgid ""
-"If a wired connection is detected, <span "
-"class=\"application\">NetworkManager</span> automatically connects to it."
+"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
+"\">Select Network</span>."
msgstr ""
-"اگر یک اتصال باسیم شناسایی شود، <span class=\"application\""
-">NetworkManager</span> به طور خودکار به آن متصل می‌شود."
#. type: Bullet: ' - '
-msgid ""
-"To connect to a wireless connection, click on the <span "
-"class=\"application\">NetworkManager Applet</span> to see the list of "
-"available connections. Then select the one you want to connect to."
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
msgstr ""
-"برای وصل شدن به یک اتصال بی‌سیم، روی <span class=\"application\">برنامک "
-"NetworkManager</span> کلیک کنید تا فهرست اتصال‌های موجود را ببینید. سپس "
-"اتصالی که قصد وصل شدن به آن دارید را انتخاب کنید."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
msgid "After establishing a connection to a network:"
msgstr "پس از برقراری اتصال به شبکه:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
-" <span class=\"application\">[[Vidalia]]</span> are automatically "
-"started.\n"
-" b. If you need to log in to a captive portal before being granted access "
-"to\n"
-" the Internet, then [[see the corresponding "
-"documentation|unsafe_browser]].\n"
+" <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
msgstr ""
" الف. اگر امکان دسترسی به اینترنت دارید پس تور و \n"
-" <span class=\"application\">[[ویدالیا]]</span> خودکار راه‌اندازی "
-"شده‌اند.\n"
-" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو "
-"پورتال شوید،\n"
+" <span class=\"application\">[[ویدالیا]]</span> خودکار راه‌اندازی شده‌اند.\n"
+" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو پورتال شوید،\n"
" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"<span class=\"application\">NetworkManager Applet</span>\n"
-"and choose <span class=\"guimenu\">Edit Connections...</span>\n"
-msgstr ""
-"می‌توانید تنظیمات هر کدام از اتصالات ذخیره‌شدهٔ شبکه را تغییر دهید\n"
-"(برای مثال برای این که ببینید می‌خواهید خودکار به یک شبکهٔ وای‌فای وصل شوید "
-"یا نه).\n"
-"برای این کار روی <span class=\"application\">برنامک NetworkManager</span>\n"
-"کلیک و <span class=\"guimenu\">ویرایش اتصالات...</span> را انتخاب کنید.\n"
+" b. If you need to log in to a captive portal before being granted access to\n"
+" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgstr ""
+" الف. اگر امکان دسترسی به اینترنت دارید پس تور و \n"
+" <span class=\"application\">[[ویدالیا]]</span> خودکار راه‌اندازی شده‌اند.\n"
+" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو پورتال شوید،\n"
+" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"If you want to reuse your custom <span "
-"class=\"application\">NetworkManager</span>\n"
-"configuration or the passwords of encrypted wireless connections across "
-"separate\n"
-"working sessions, you can activate the [[<span class=\"guilabel\">Network "
-"connections</span> persistence\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose <span class=\"guilabel\">Network</span>."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
+msgid ""
+"If you want to reuse your custom\n"
+"configuration or the passwords of encrypted wireless connections across separate\n"
+"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
msgstr ""
-"اگر قصد استفادهٔ دوباره از تنظیمات اختصاصی <span class=\"application\""
-">NetworkManager</span> خود\n"
-"یا گذرواژه‌های رمزگذاری‌شدهٔ اتصالات بی‌سیم را در نشست‌های کاری مختلف دارید، "
-"می‌توانید \n"
+"اگر قصد استفادهٔ دوباره از تنظیمات اختصاصی <span class=\"application\">NetworkManager</span> خود\n"
+"یا گذرواژه‌های رمزگذاری‌شدهٔ اتصالات بی‌سیم را در نشست‌های کاری مختلف دارید، می‌توانید \n"
"[[ویژگی <span class=\"guilabel\">اتصالات شبکه</span> \n"
-"مانا|first_steps/persistence/configure#network_connections]] را انتخاب کنید."
-"\n"
+"مانا|first_steps/persistence/configure#network_connections]] را انتخاب کنید.\n"
#. type: Plain text
msgid ""
"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network "
-"fingerprinting|doc/about/fingerprint]]."
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
msgstr ""
"اگر نگران شناخته‌شدن به عنوان یک کاربر تیلز روی شبکهٔ خود هستید، سند ما راجع "
"به [[اثر انگشت در شبکه|doc/about/fingerprint]] را بخوانید."
@@ -160,20 +162,28 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
+msgid "<p>It is currently impossible to connect using:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
msgid ""
"<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> does not support "
-"dial-up\n"
-"modems. See [[!tails_ticket 5913]].</li>\n"
-"<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]</li>\n"
+"<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
"<li><span class=\"application\">NetworkManager</span> از مودم‌های دایال‌آپ\n"
"پشتیبانی نمی‌کند. رجوع کنید به [[!tails_ticket 5913]].</li>\n"
-"<li>در حال حاضر در تیلز امکان استفاده از وی‌پی‌ان وجود ندارد. [[سوالات "
-"متداول\n"
+"<li>در حال حاضر در تیلز امکان استفاده از وی‌پی‌ان وجود ندارد. [[سوالات متداول\n"
"در این زمینه را ببینید.|support/faq#vpn]]</li>\n"
"</ul>\n"
@@ -183,18 +193,53 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
+#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgid ""
-"For more information about <span "
-"class=\"application\">NetworkManager</span>, open\n"
-"<span class=\"application\">[[GNOME "
-"Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgstr ""
-"برای کسب اطلاعات بیشتر در مورد <span class=\"application\""
-">NetworkManager</span>، \n"
-"<span class=\"application\">[[کمک "
-"گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span> "
-"را باز کرده و\n"
-"<span class=\"guilabel\">شبکه، وب، رایانه و گفتگوهای آنلاین</span> را انتخاب "
-"کنید.\n"
+"برای کسب اطلاعات بیشتر در مورد <span class=\"application\">NetworkManager</span>، \n"
+"<span class=\"application\">[[کمک گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span> را باز کرده و\n"
+"<span class=\"guilabel\">شبکه، وب، رایانه و گفتگوهای آنلاین</span> را انتخاب کنید.\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "ابزار <span class=\"application\">NetworkManager</span>\n"
+#~ "به شما اجازه می‌دهد با کمک یک اتصال بی‌سیم (وای‌فای، ۳جی یا جی‌اس‌ام) یا باسیم به اینترنت وصل شوید:\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the <span class="
+#~ "\"application\">NetworkManager Applet</span> to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "برای وصل شدن به یک اتصال بی‌سیم، روی <span class=\"application\">برنامک "
+#~ "NetworkManager</span> کلیک کنید تا فهرست اتصال‌های موجود را ببینید. سپس "
+#~ "اتصالی که قصد وصل شدن به آن دارید را انتخاب کنید."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "<span class=\"application\">NetworkManager Applet</span>\n"
+#~ "and choose <span class=\"guimenu\">Edit Connections...</span>\n"
+#~ msgstr ""
+#~ "می‌توانید تنظیمات هر کدام از اتصالات ذخیره‌شدهٔ شبکه را تغییر دهید\n"
+#~ "(برای مثال برای این که ببینید می‌خواهید خودکار به یک شبکهٔ وای‌فای وصل شوید یا نه).\n"
+#~ "برای این کار روی <span class=\"application\">برنامک NetworkManager</span>\n"
+#~ "کلیک و <span class=\"guimenu\">ویرایش اتصالات...</span> را انتخاب کنید.\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fr.po b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
index 3a34c71..2e19d63 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fr.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-28 21:22+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-31 16:13-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,60 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Se connecter au réseau avec NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"<span class=\"application\">NetworkManager</span> vous permet de vous connecter\n"
-"à un réseau en utilisant une connexion filaire ou sans-fil (Wi-Fi, 3G, ou GSM) :\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, <span class=\"application"
-"\">NetworkManager</span> automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, <span class=\"application"
+#| "\">NetworkManager</span> automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Si une connexion filaire est détectée, <span class=\"application"
"\">NetworkManager</span> s'y connecte automatiquement."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the <span class=\"application"
-"\">NetworkManager Applet</span> to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
+"\">Select Network</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
msgstr ""
-"Pour se connecter à une connexion sans-fil, cliquer sur l'<span class="
-"\"application\">Applet NetworkManager</span> pour voir la liste des "
-"connexions disponibles. Choisir ensuite celle à laquelle vous voulez vous "
-"connecter."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
msgstr ""
#. type: Plain text
@@ -74,10 +78,29 @@ msgid "After establishing a connection to a network:"
msgstr "Après établissement d'une connexion à un réseau :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+msgstr ""
+" a. Si vous pouvez déjà accéder à Internet, Tor et\n"
+" <span class=\"application\">[[Vidalia]]</span> démarrent automatiquement.\n"
+" b. Si vous avez besoin de vous identifier à un portail captif afin d'obtenir accès à Internet,\n"
+" alors [[voir notre documentation correspondante|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -87,24 +110,30 @@ msgstr ""
" alors [[voir notre documentation correspondante|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"<span class=\"application\">NetworkManager Applet</span>\n"
-"and choose <span class=\"guimenu\">Edit Connections...</span>\n"
-msgstr ""
-"Vous pouvez modifier les paramètres de chaque connexion\n"
-"réseau enregistrée (par exemple pour choisir de se connecter automatiquement\n"
-"ou non à un réseau Wi-Fi). Pour cela, faire clique-droit sur\n"
-"l'<span class=\"application\">Applet NetworkManager</span> et\n"
-"choisir <span class=\"guimenu\">Modification des connexions...</span>\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose <span class=\"guilabel\">Network</span>."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -131,12 +160,22 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
+msgid "<p>It is currently impossible to connect using:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
msgid ""
"<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].</li>\n"
-"<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]</li>\n"
+"<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
@@ -152,9 +191,13 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
+#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgid ""
-"For more information about <span class=\"application\">NetworkManager</span>, open\n"
+"For more information, open\n"
"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgstr ""
@@ -162,6 +205,42 @@ msgstr ""
"<span class=\"application\">[[l'aide de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"et choisir <span class=\"guilabel\">Réseau, Web, courriel & chat</span>.\n"
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "<span class=\"application\">NetworkManager</span> vous permet de vous connecter\n"
+#~ "à un réseau en utilisant une connexion filaire ou sans-fil (Wi-Fi, 3G, ou GSM) :\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the <span class="
+#~ "\"application\">NetworkManager Applet</span> to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Pour se connecter à une connexion sans-fil, cliquer sur l'<span class="
+#~ "\"application\">Applet NetworkManager</span> pour voir la liste des "
+#~ "connexions disponibles. Choisir ensuite celle à laquelle vous voulez vous "
+#~ "connecter."
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "<span class=\"application\">NetworkManager Applet</span>\n"
+#~ "and choose <span class=\"guimenu\">Edit Connections...</span>\n"
+#~ msgstr ""
+#~ "Vous pouvez modifier les paramètres de chaque connexion\n"
+#~ "réseau enregistrée (par exemple pour choisir de se connecter automatiquement\n"
+#~ "ou non à un réseau Wi-Fi). Pour cela, faire clique-droit sur\n"
+#~ "l'<span class=\"application\">Applet NetworkManager</span> et\n"
+#~ "choisir <span class=\"guimenu\">Modification des connexions...</span>\n"
+
#~ msgid ""
#~ "The name is quite self-explanatory – this is what you should use to "
#~ "manage your network, which usually only consists of establishing an "
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.pt.po b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
index 32d51f7..6914390 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.pt.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-29 20:20+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-08-26 15:44-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,59 +16,61 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Conectando à rede com o NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
-#| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"O <span class=\"application\">NetworkManager</span> permite que você conecte a\n"
-"uma rede local usando conexão com ou sem fio (Wi-Fi, 3G, ou GSM):\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, <span class=\"application"
-"\">NetworkManager</span> automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, <span class=\"application"
+#| "\">NetworkManager</span> automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Se uma conexão com fio é detectada, o <span class=\"application"
"\">NetworkManager</span> conecta automaticamente a ela."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the <span class=\"application"
-"\">NetworkManager Applet</span> to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
+"\">Select Network</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
msgstr ""
-"Para conectar a uma conexão sem fio, clique no <span class=\"application"
-"\">Miniaplicativo NetworkManager</span> para ver uma lista de conexões "
-"disponíveis. A seguir, selecione a conexão à qual você quer conectar."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
#, fuzzy
@@ -77,10 +79,29 @@ msgid "After establishing a connection to a network:"
msgstr "Após estabelecer uma conexão à rede local:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+msgstr ""
+" a. Se você já consegue acessar a Internet, o Tor e o\n"
+" <span class=\"application\">[[Vidalia]]</span> são iniciados automaticamente.\n"
+" b. Se você precisa fazer login em um portal captivo antes de poder acessar a\n"
+" Internet, então [[veja a documentação correspondente|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -90,19 +111,30 @@ msgstr ""
" Internet, então [[veja a documentação correspondente|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"<span class=\"application\">NetworkManager Applet</span>\n"
-"and choose <span class=\"guimenu\">Edit Connections...</span>\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose <span class=\"guilabel\">Network</span>."
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -134,12 +166,22 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
+msgid "<p>It is currently impossible to connect using:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
msgid ""
"<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].</li>\n"
-"<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]</li>\n"
+"<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
@@ -157,11 +199,40 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"For more information about <span class=\"application\">NetworkManager</span>, open\n"
+"For more information, open\n"
"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgstr ""
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+#~| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgid ""
+#~ "<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "O <span class=\"application\">NetworkManager</span> permite que você conecte a\n"
+#~ "uma rede local usando conexão com ou sem fio (Wi-Fi, 3G, ou GSM):\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the <span class="
+#~ "\"application\">NetworkManager Applet</span> to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Para conectar a uma conexão sem fio, clique no <span class=\"application"
+#~ "\">Miniaplicativo NetworkManager</span> para ver uma lista de conexões "
+#~ "disponíveis. A seguir, selecione a conexão à qual você quer conectar."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
#~ msgid ""
#~ "The name is quite self-explanatory – this is what you should use to "
#~ "manage your network, which usually only consists of establishing an "
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
index 1aecae2..3311e22 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-02-04 15:54+0100\n"
"PO-Revision-Date: 2015-11-27 17:44+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -43,9 +43,13 @@ msgstr ""
"Laufwerksverschlüsselung unter Linux."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "The GNOME <span class=\"application\">Disk Utility</span> allows you to "
+#| "create encrypted volumes."
msgid ""
-"The GNOME <span class=\"application\">Disk Utility</span> allows you to "
-"create encrypted volumes."
+"<span class=\"application\">GNOME Disks</span> allows you to create "
+"encrypted volumes."
msgstr ""
"Die GNOME <span class=\"application\">Laufwerksverwaltung</span> erlaubt es "
"Ihnen, verschlüsselte Laufwerke zu erstellen."
@@ -75,8 +79,9 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=1]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!toc levels=1]]\n"
+msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
@@ -85,13 +90,19 @@ msgid "Create an encrypted partition\n"
msgstr "Eine verschlüsselte Partition erstellen\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
msgid ""
-"To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+"To open <span class=\"application\">GNOME Disks</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
"Um die GNOME <span class=\"application\">Laufwerksverwaltung</span> zu öffnen, wählen Sie\n"
"<span class=\"menuchoice\">\n"
@@ -99,15 +110,19 @@ msgstr ""
" <span class=\"guisubmenu\">Zubehör</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Laufwerksverwaltung</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+msgid "Identify your external storage device\n"
msgstr "<h2 class=\"bullet-number-one\">Identifizieren Sie das externe Speichermedium</h2>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices on the left side of the screen.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+"<span class=\"application\">Disks</span> lists all the current storage\n"
"devices on the left side of the screen.\n"
msgstr ""
"Die <span class=\"application\">Laufwerksverwaltung</span> listet alle derzeitigen Speichermedien\n"
@@ -135,11 +150,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
-msgstr "<h2 class=\"bullet-number-two\">Formatieren Sie das Medium</h2>\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
" 1. Check that the description of the device on the right side of the screen\n"
" corresponds to your device: its brand, its size, etc.\n"
@@ -147,35 +157,65 @@ msgstr ""
" 1. Überprüfen Sie, dass die Beschreibung des Mediums auf der rechten Seite des Bildschirms\n"
" Ihrem Medium entspricht: das Modell, die Größe, usw.\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
+msgid "Format the device\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-" 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
-" existing partitions on the device.\n"
+"Click on the <span class=\"guimenu\">[[!img lib/emblem-system.png alt="
+"\"System\" class=\"symbolic\" link=\"no\"]]</span> button in the titlebar "
+"and choose <span class=\"guilabel\">Format…</span> to erase all the existing "
+"partitions on the device."
msgstr ""
-" 1. Wählen Sie <span class=\"guilabel\">Datenträger formatieren</span> aus, um alle\n"
-" auf dem Medium existierenden Partitionen zu löschen.\n"
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Format Disk</span> dialog:"
+msgstr "Wählen Sie <span class=\"guilabel\">Partition erstellen</span> aus."
+
+#. type: Bullet: ' - '
+msgid ""
+"If you want to erase all data securely, choose to <span class=\"guilabel"
+"\">Overwrite existing data with zeroes</span> in the <span class=\"guilabel"
+"\">Erase</span> drop-down list."
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-" 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
-" you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
-" Record</span> selected.\n"
+"Choose <span class=\"guilabel\">Compatible with all systems and devices (MBR/"
+"DOS)</span> in the <span class=\"guilabel\">Partitioning</span> drop-down "
+"list."
msgstr ""
-" 1. Falls Sie sich unsicher sind, lassen Sie in dem Dialogfenster zum Auswählen des <span\n"
-" class=\"guilabel\">Schema</span> den voreingestellten Wert <span class=\"guilabel\">Master Boot\n"
-" Record</span> ausgewählt.\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-three\">Erstellen Sie eine neue, verschlüsselte Partition</h2>\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Format…</span>.\n"
+msgstr " Klicken Sie anschließend auf die <span class=\"button\">Erstellen</span>-Schaltfläche.\n"
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, make sure that the device is correct. Click "
+"<span class=\"button\">Format</span> to confirm."
+msgstr ""
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Create an encrypted partition\n"
+msgid "Create a new encrypted partition\n"
+msgstr "Eine verschlüsselte Partition erstellen\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Now the schema of the partitions in the middle of the screen shows an "
+#| "empty device."
msgid ""
"Now the schema of the partitions in the middle of the screen shows an empty "
-"device."
+"device:"
msgstr ""
"Nun zeigt das Schema der Partitionen in der Mitte des Bildschirms ein leeres "
"Medium an."
@@ -186,42 +226,49 @@ msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
msgstr "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
#. type: Bullet: ' 1. '
-msgid "Click on <span class=\"guilabel\">Create Partition</span>."
-msgstr "Wählen Sie <span class=\"guilabel\">Partition erstellen</span> aus."
+msgid ""
+"Click on the <span class=\"guimenu\">[[!img lib/list-add.png alt=\"Create "
+"partition\" class=\"symbolic\" link=\"no\"]]</span> button to create a new "
+"partition on the device."
+msgstr ""
#. type: Bullet: ' 1. '
-msgid "Configure the new partition:"
-msgstr "Konfigurieren Sie die neue Partition:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
-msgstr " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Create Partition</span> dialog:"
+msgstr "Wählen Sie <span class=\"guilabel\">Partition erstellen</span> aus."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Size</span>. You can decide to create a "
+#| "partition on the whole device or just on part of it. In this example we "
+#| "are creating a partition of 2.0 GB on a device of 3.9 GB."
msgid ""
-"<span class=\"guilabel\">Size</span>. You can decide to create a partition "
-"on the whole device or just on part of it. In this example we are creating a "
-"partition of 2.0 GB on a device of 3.9 GB."
+"<span class=\"guilabel\">Partition Size</span>: you can create a partition "
+"on the whole device or only on part of it. In this example we are creating a "
+"partition of 4.0 GB on a device of 8.1 GB."
msgstr ""
"<span class=\"guilabel\">Größe</span>. Sie können sich dazu entscheiden, "
"eine Partition auf dem gesamten Medium oder nur auf einem Teil zu erstellen. "
"In diesem Beispiel erstellen wir eine 2.0 GB große Partition auf einem Gerät "
"mit einer Größe von 3.9 GB."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Type</span>. You can change the file system type of "
-"the partition. If you are not sure you can leave the default value: <span "
-"class=\"guilabel\">Ext4</span>."
+"<span class=\"guilabel\">Type</span>: choose <span class=\"guilabel"
+"\">Encrypted, compatible with Linux systems (LUKS + Ext4)</span> from the "
+"drop-down list."
msgstr ""
-"<span class=\"guilabel\">Typ</span>. Sie können das Dateisystem der "
-"Partition ändern. Wenn Sie sich nicht sicher sind, können Sie den "
-"voreingestellten Wert belassen: <span class=\"guilabel\">Ext4</span>."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Name</span>. You can set a name for the "
+#| "partition. This name remains invisible until the partition is open but "
+#| "can help you to identify it during use."
msgid ""
-"<span class=\"guilabel\">Name</span>. You can set a name for the partition. "
+"<span class=\"guilabel\">Name</span>: you can set a name for the partition. "
"This name remains invisible until the partition is open but can help you to "
"identify it during use."
msgstr ""
@@ -230,71 +277,89 @@ msgstr ""
"verborgen, kann Ihnen jedoch dabei behilflich sein, sie beim Benutzen zu "
"erkennen."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
-"option to encrypt the partition."
+"<span class=\"guilabel\">Passphrase</span>: type a passphrase for the "
+"encrypted partition and repeat it to confirm."
msgstr ""
-"<span class=\"guilabel\">Das zugrunde liegende Gerät verschlüsseln</span>. "
-"Wählen Sie diese Option aus, um die Partition zu verschlüsseln."
#. type: Plain text
-#, no-wrap
-msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Create</span>.\n"
msgstr " Klicken Sie anschließend auf die <span class=\"button\">Erstellen</span>-Schaltfläche.\n"
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Enter a passphrase for the new partition in the <span class=\"guilabel"
-"\">Enter passphrase</span> dialog box. Then click on the <span class=\"button"
-"\">Create</span> button."
+" <div class=\"bug\">\n"
+" <p>If an error occurs while creating the new partition, try to unplug the\n"
+" device, restart <span class=\"application\">GNOME Disks</span>,\n"
+" and follow all steps again from the beginning.</p>\n"
+" </div>\n"
msgstr ""
-"Geben Sie eine Passphrase für die neue Partition in dem <span class="
-"\"guilabel\">Kennwort eingeben</span> Eingabefenster ein. Klicken Sie "
-"anschließend auf die <span class=\"button\">Erstellen</span>-Schaltfläche."
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "Creating the partition takes from a few seconds to a few minutes. After "
+#| "that, the new encrypted partition appears in the volumes of the device:"
msgid ""
"Creating the partition takes from a few seconds to a few minutes. After "
-"that, the new encrypted partition appears in the volumes of the device:"
+"that, the new encrypted partition appears in the volumes on the device:"
msgstr ""
"Das Erstellen der Partition braucht einige Sekunden bis Minuten. "
"Anschließend erscheint die neue, verschlüsselte Partition in den Laufwerken "
"des Mediums:"
#. type: Plain text
-#, no-wrap
-msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+#, fuzzy, no-wrap
+#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
msgstr " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "At this point you can create other partitions in the free space left on "
+#| "the device, if you want, by clicking on it and doing again <span class="
+#| "\"guilabel\">Create Partition</span>."
msgid ""
-"At this point you can create other partitions in the free space left on the "
-"device, if you want, by clicking on it and doing again <span class=\"guilabel"
-"\">Create Partition</span>."
+"If you want to create another partition in the free space on the device, "
+"click on the free space and then click on the <span class=\"guimenu\">[[!img "
+"lib/list-add.png alt=\"Create partition\" class=\"symbolic\" link=\"no\"]]</"
+"span> button again."
msgstr ""
"An diesem Punkt können Sie, wenn Sie möchten, weitere Partitionen in dem "
"restlichen freien Speicherplatz erstellen, indem Sie darauf klicken und "
"erneut <span class=\"guilabel\">Partition erstellen</span> auswählen."
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-four\">Benutzen Sie die neue Partition</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Configure the new partition:"
+msgid "Use the new partition\n"
+msgstr "Konfigurieren Sie die neue Partition:"
#. type: Plain text
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "You can access this new volume from the <span class=\"guimenu\">Places</"
+#| "span> menu\n"
+#| "with the name you gave it.\n"
msgid ""
-"You can access this new volume from the <span class=\"guimenu\">Places</span> menu\n"
-"with the name you gave it.\n"
+"You can open this new partition from the sidebar of the file browser with "
+"the name you gave it."
msgstr ""
-"Sie können von dem <span class=\"guimenu\">Orte</span>-Menü aus mit dem Namen, den Sie\n"
+"Sie können von dem <span class=\"guimenu\">Orte</span>-Menü aus mit dem "
+"Namen, den Sie\n"
"ihm gegeben haben, auf dieses neue Laufwerk zugreifen.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
-msgstr "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+msgid ""
+"After opening the partition with the file browser, you can also access it\n"
+"from the <span class=\"guimenu\">Places</span> menu.\n"
+msgstr ""
#. type: Title =
#, no-wrap
@@ -302,34 +367,26 @@ msgid "Open an existing encrypted partition\n"
msgstr "Öffnen Sie eine bestehende, verschlüsselte Partition\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"When plugging in a device containing an encrypted partition, Tails does not mount it\n"
-"automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-"menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-"like in the example, you can use their sizes to guess which one is the one you want\n"
-"to open.\n"
+"When plugging in a device containing an encrypted partition, Tails does not "
+"open the partition automatically but you can do so from the file browser."
msgstr ""
-"Wenn ein Medium, welches eine verschlüsselte Partition enthält, angeschlossen wird, hängt Tails\n"
-"es nicht automatisch ein, es erscheint aber im <span class=\"guimenu\">Orte</span>-Menü.\n"
-"Wenn mehrere Partitionen, wie in dem Beispiel, als <span class=\"guimenu\">Verschlüsselt</span> angezeigt\n"
-"werden, können Sie ihre Größe dazu benutzen, um zu erraten, welche jene ist, die Sie öffnen\n"
-"möchten.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
-msgstr "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Once you are done using the device, to close the encrypted partition choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Computer</span></span>,\n"
+#| "right-click on the device, and select <span class=\"guilabel\">Safely\n"
+#| "Remove Drive</span>.\n"
msgid ""
-"Once you are done using the device, to close the encrypted partition choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Computer</span></span>,\n"
-"right-click on the device, and select <span class=\"guilabel\">Safely\n"
-"Remove Drive</span>.\n"
+"1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Computer</span></span>\n"
+" to open the file browser.\n"
msgstr ""
"Wenn Sie mit der Verwendung des Mediums fertig sind, wählen Sie zum Schließen der verschlüsselten Partition\n"
"<span class=\"menuchoice\">\n"
@@ -338,6 +395,53 @@ msgstr ""
"rechtsklicken das Medium und wählen <span class=\"guilabel\">Laufwerk\n"
"sicher entfernen</span> aus.\n"
+#. type: Bullet: '1. '
+msgid "Click on the encrypted partition that you want to open in the sidebar."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+msgid " [[!img nautilus_encrypted.png link=\"no\" alt=\"File browser with '4.0 GB Encrypted' entry in the sidebar\"]]\n"
+msgstr "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+
+#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Enter a passphrase for the new partition in the <span class=\"guilabel"
+#| "\">Enter passphrase</span> dialog box. Then click on the <span class="
+#| "\"button\">Create</span> button."
+msgid ""
+"Enter the passphrase of the partition in the password prompt and click <span "
+"class=\"button\">Unlock</span>."
+msgstr ""
+"Geben Sie eine Passphrase für die neue Partition in dem <span class="
+"\"guilabel\">Kennwort eingeben</span> Eingabefenster ein. Klicken Sie "
+"anschließend auf die <span class=\"button\">Erstellen</span>-Schaltfläche."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you choose the option <span class=\"guilabel\">Remember Password</span> and have\n"
+" the <span class=\"guilabel\">[[GNOME Keyring|first_steps/persistence/configure#gnome_keyring]]</span>\n"
+" persistence feature activated, the password is stored in the persistent storage and remembered across multiple\n"
+" working sessions.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After opening the partition with the file browser, you can also access it "
+"from the <span class=\"guimenu\">Places</span> menu."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"To close the partition after you finished using it, click on the <span class="
+"\"guimenu\">[[!img lib/media-eject.png alt=\"Eject\" class=\"symbolic\" link="
+"\"no\"]]</span> button next to the partition in the sidebar of the file "
+"browser."
+msgstr ""
+
#. type: Title =
#, no-wrap
msgid "Storing sensitive documents\n"
@@ -369,3 +473,63 @@ msgstr ""
"Betriebssystemen zu öffnen, aber es könnte Ihre Sicherheit gefährden. "
"Anderen Betriebssystemen sollte vermutlich nicht vertraut werden, mit "
"sensiblen Informationen umzugehen und keine Spur zu hinterlassen."
+
+#~ msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-two\">Formatieren Sie das Medium</h2>\n"
+
+#~ msgid ""
+#~ " 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
+#~ " existing partitions on the device.\n"
+#~ msgstr ""
+#~ " 1. Wählen Sie <span class=\"guilabel\">Datenträger formatieren</span> aus, um alle\n"
+#~ " auf dem Medium existierenden Partitionen zu löschen.\n"
+
+#~ msgid ""
+#~ " 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
+#~ " you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span> selected.\n"
+#~ msgstr ""
+#~ " 1. Falls Sie sich unsicher sind, lassen Sie in dem Dialogfenster zum Auswählen des <span\n"
+#~ " class=\"guilabel\">Schema</span> den voreingestellten Wert <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span> ausgewählt.\n"
+
+#~ msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-three\">Erstellen Sie eine neue, verschlüsselte Partition</h2>\n"
+
+#~ msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+#~ msgstr " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Type</span>. You can change the file system type "
+#~ "of the partition. If you are not sure you can leave the default value: "
+#~ "<span class=\"guilabel\">Ext4</span>."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">Typ</span>. Sie können das Dateisystem der "
+#~ "Partition ändern. Wenn Sie sich nicht sicher sind, können Sie den "
+#~ "voreingestellten Wert belassen: <span class=\"guilabel\">Ext4</span>."
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
+#~ "option to encrypt the partition."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">Das zugrunde liegende Gerät verschlüsseln</"
+#~ "span>. Wählen Sie diese Option aus, um die Partition zu verschlüsseln."
+
+#~ msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-four\">Benutzen Sie die neue Partition</h2>\n"
+
+#~ msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+#~ msgstr "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+
+#~ msgid ""
+#~ "When plugging in a device containing an encrypted partition, Tails does not mount it\n"
+#~ "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
+#~ "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
+#~ "like in the example, you can use their sizes to guess which one is the one you want\n"
+#~ "to open.\n"
+#~ msgstr ""
+#~ "Wenn ein Medium, welches eine verschlüsselte Partition enthält, angeschlossen wird, hängt Tails\n"
+#~ "es nicht automatisch ein, es erscheint aber im <span class=\"guimenu\">Orte</span>-Menü.\n"
+#~ "Wenn mehrere Partitionen, wie in dem Beispiel, als <span class=\"guimenu\">Verschlüsselt</span> angezeigt\n"
+#~ "werden, können Sie ihre Größe dazu benutzen, um zu erraten, welche jene ist, die Sie öffnen\n"
+#~ "möchten.\n"
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
index 87d7a09..9bc9f35 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-02-04 15:54+0100\n"
"PO-Revision-Date: 2015-10-17 06:43+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -56,8 +56,8 @@ msgstr ""
#| "The GNOME <span class=\"application\">Disk Utility</span>, allows you to "
#| "create encrypted volumes."
msgid ""
-"The GNOME <span class=\"application\">Disk Utility</span> allows you to "
-"create encrypted volumes."
+"<span class=\"application\">GNOME Disks</span> allows you to create "
+"encrypted volumes."
msgstr ""
"<span class=\"application\">ابزار دیسک</span> گنوم به شما اجازه می‌دهد "
"درایوهای رمزگذاری‌شده ایجاد کنید."
@@ -88,8 +88,9 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=1]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!toc levels=1]]\n"
+msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
@@ -98,13 +99,19 @@ msgid "Create an encrypted partition\n"
msgstr "ایجاد یک درایو مانا\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
msgid ""
-"To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+"To open <span class=\"application\">GNOME Disks</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
"برای باز کردن <span class=\"application\">ابزار دیسک</span> گنوم از این مسیر بروید:\n"
"<span class=\"menuchoice\">\n"
@@ -112,15 +119,19 @@ msgstr ""
" <span class=\"guisubmenu\">ابزارهای کمکی</span>&nbsp;◀\n"
" <span class=\"guimenuitem\">ابزارهای دیسک</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+msgid "Identify your external storage device\n"
msgstr "<h2 class=\"bullet-number-one\">دستگاه ذخیرهٔ خارجی خود را مشخص کنید</h2>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices on the left side of the screen.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+"<span class=\"application\">Disks</span> lists all the current storage\n"
"devices on the left side of the screen.\n"
msgstr ""
"<span class=\"application\">ابزار دیسک</span> تمام دستگاه‌های ذخیرهٔ\n"
@@ -145,11 +156,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
-msgstr "<h2 class=\"bullet-number-two\">دستگاه را فرمت کنید</h2>\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
" 1. Check that the description of the device on the right side of the screen\n"
" corresponds to your device: its brand, its size, etc.\n"
@@ -157,35 +163,65 @@ msgstr ""
" ۱. توضیحات دستگاه را سمت چپ صفحه ببینید،\n"
" از جمله مارک، گنجایش آن و غیره.\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
+msgid "Format the device\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-" 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
-" existing partitions on the device.\n"
+"Click on the <span class=\"guimenu\">[[!img lib/emblem-system.png alt="
+"\"System\" class=\"symbolic\" link=\"no\"]]</span> button in the titlebar "
+"and choose <span class=\"guilabel\">Format…</span> to erase all the existing "
+"partitions on the device."
msgstr ""
-" ۱. روی <span class=\"guilabel\">Format Drive</span> کلیک کنید\n"
-" تا تمام پارتیشن‌های موجود روی دستگاه پاک شوند.\n"
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Format Disk</span> dialog:"
+msgstr "روی <span class=\"guilabel\">ایجاد پارتیشن</span> کلیک کنید."
+
+#. type: Bullet: ' - '
msgid ""
-" 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
-" you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
-" Record</span> selected.\n"
+"If you want to erase all data securely, choose to <span class=\"guilabel"
+"\">Overwrite existing data with zeroes</span> in the <span class=\"guilabel"
+"\">Erase</span> drop-down list."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Choose <span class=\"guilabel\">Compatible with all systems and devices (MBR/"
+"DOS)</span> in the <span class=\"guilabel\">Partitioning</span> drop-down "
+"list."
msgstr ""
-" ۱. در پنجرهٔ گفتگو <span class=\"guilabel\">Scheme</span> را انتخاب کنید.\n"
-" اگر مطمئن نیستید گزینهٔ پیش‌فرض <span class=\"guilabel\">Master Boot\n"
-" Record</span> را دست‌نخورده باقی بگذارید.\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-three\">ایجاد یک پارتیشن جدید رمزگذاری‌شده</h2>\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Format…</span>.\n"
+msgstr " سپس روی دکمهٔ <span class=\"button\">ایجاد</span> کلیک کنید.\n"
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, make sure that the device is correct. Click "
+"<span class=\"button\">Format</span> to confirm."
+msgstr ""
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Create an encrypted partition\n"
+msgid "Create a new encrypted partition\n"
+msgstr "ایجاد یک درایو مانا\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Now the schema of the partitions in the middle of the screen shows an "
+#| "empty device."
msgid ""
"Now the schema of the partitions in the middle of the screen shows an empty "
-"device."
+"device:"
msgstr "حالا رابط پارتیشن در وسط صفحه یک دستگاه خالی نشان می‌دهد."
#. type: Plain text
@@ -194,41 +230,48 @@ msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
msgstr "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
#. type: Bullet: ' 1. '
-msgid "Click on <span class=\"guilabel\">Create Partition</span>."
-msgstr "روی <span class=\"guilabel\">ایجاد پارتیشن</span> کلیک کنید."
+msgid ""
+"Click on the <span class=\"guimenu\">[[!img lib/list-add.png alt=\"Create "
+"partition\" class=\"symbolic\" link=\"no\"]]</span> button to create a new "
+"partition on the device."
+msgstr ""
#. type: Bullet: ' 1. '
-msgid "Configure the new partition:"
-msgstr "پارتیشن جدید را پیکربندی کنید:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
-msgstr " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Create Partition</span> dialog:"
+msgstr "روی <span class=\"guilabel\">ایجاد پارتیشن</span> کلیک کنید."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Size</span>. You can decide to create a "
+#| "partition on the whole device or just on part of it. In this example we "
+#| "are creating a partition of 2.0 GB on a device of 3.9 GB."
msgid ""
-"<span class=\"guilabel\">Size</span>. You can decide to create a partition "
-"on the whole device or just on part of it. In this example we are creating a "
-"partition of 2.0 GB on a device of 3.9 GB."
+"<span class=\"guilabel\">Partition Size</span>: you can create a partition "
+"on the whole device or only on part of it. In this example we are creating a "
+"partition of 4.0 GB on a device of 8.1 GB."
msgstr ""
"<span class=\"guilabel\">گنجایش</span>. می‌توانید تصمیم بگیرید که روی کل "
"دستگاه یک پارتیشن بسازید یا تنها روی بخشی از آن. در این مثال یک پارتیشن "
"۲گیگابایتی روی یک دستگاه ۳٫۹گیگابایتی ایجاد می‌کنیم."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Type</span>. You can change the file system type of "
-"the partition. If you are not sure you can leave the default value: <span "
-"class=\"guilabel\">Ext4</span>."
+"<span class=\"guilabel\">Type</span>: choose <span class=\"guilabel"
+"\">Encrypted, compatible with Linux systems (LUKS + Ext4)</span> from the "
+"drop-down list."
msgstr ""
-"<span class=\"guilabel\">نوع</span>. می‌توانید نوع سیستم فایل پارتیشن را "
-"تغییر دهید. اگر از انتخاب خود مطمئن نیستید می‌توانید میزان پیش‌فرض <span class="
-"\"guilabel\">Ext4</span> را دست‌نخورده باقی بگذارید."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Name</span>. You can set a name for the "
+#| "partition. This name remains invisible until the partition is open but "
+#| "can help you to identify it during use."
msgid ""
-"<span class=\"guilabel\">Name</span>. You can set a name for the partition. "
+"<span class=\"guilabel\">Name</span>: you can set a name for the partition. "
"This name remains invisible until the partition is open but can help you to "
"identify it during use."
msgstr ""
@@ -236,70 +279,88 @@ msgstr ""
"کنید. این نام تا وقتی که پارتیشن باز است مخفی باقی می‌ماند، اما هنگام "
"استفاده از آن می‌توانید آن را شناسایی کنید."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
-"option to encrypt the partition."
+"<span class=\"guilabel\">Passphrase</span>: type a passphrase for the "
+"encrypted partition and repeat it to confirm."
msgstr ""
-"<span class=\"guilabel\">رمزگذاری دستگاه</span>. از این گزینه برای رمزگذاری "
-"پارتیشن استفاده کنید."
#. type: Plain text
-#, no-wrap
-msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Create</span>.\n"
msgstr " سپس روی دکمهٔ <span class=\"button\">ایجاد</span> کلیک کنید.\n"
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Enter a passphrase for the new partition in the <span class=\"guilabel"
-"\">Enter passphrase</span> dialog box. Then click on the <span class=\"button"
-"\">Create</span> button."
+" <div class=\"bug\">\n"
+" <p>If an error occurs while creating the new partition, try to unplug the\n"
+" device, restart <span class=\"application\">GNOME Disks</span>,\n"
+" and follow all steps again from the beginning.</p>\n"
+" </div>\n"
msgstr ""
-"در پنجرهٔ <span class=\"guilabel\">وارد کردن گذرواژه</span> برای پارتیشن جدید "
-"یک گذرواژهٔ جدید انتخاب کنید. سپس روی دکمهٔ <span class=\"button\">ایجاد</"
-"span> کلیک کنید."
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "Creating the partition takes from a few seconds to a few minutes. After "
+#| "that, the new encrypted partition appears in the volumes of the device:"
msgid ""
"Creating the partition takes from a few seconds to a few minutes. After "
-"that, the new encrypted partition appears in the volumes of the device:"
+"that, the new encrypted partition appears in the volumes on the device:"
msgstr ""
"ایجاد پارتیشن ممکن است چند ثانیه تا چند دقیقه طول بکشد. پس از آن پارتیشن "
"جدید رمزگذاری‌شده در قسمت درایوهای دستگاه دیده می‌شود:"
#. type: Plain text
-#, no-wrap
-msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+#, fuzzy, no-wrap
+#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
msgstr " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "At this point you can create other partitions in the free space left on "
+#| "the device, if you want, by clicking on it and doing again <span class="
+#| "\"guilabel\">Create Partition</span>."
msgid ""
-"At this point you can create other partitions in the free space left on the "
-"device, if you want, by clicking on it and doing again <span class=\"guilabel"
-"\">Create Partition</span>."
+"If you want to create another partition in the free space on the device, "
+"click on the free space and then click on the <span class=\"guimenu\">[[!img "
+"lib/list-add.png alt=\"Create partition\" class=\"symbolic\" link=\"no\"]]</"
+"span> button again."
msgstr ""
"در این مرحله می‌توانید در صورت تمایل در فضای خالی دستگاه پارتیشن‌های جدیدی "
"ایجاد کنید. این کار را با کلیک کردن دوباره روی <span class=\"guilabel"
"\">ایجاد پارتیشن</span> انجام دهید."
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-four\">استفاده از پارتیشن جدید</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Configure the new partition:"
+msgid "Use the new partition\n"
+msgstr "پارتیشن جدید را پیکربندی کنید:"
#. type: Plain text
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "You can access this new volume from the <span class=\"guimenu\">Places</"
+#| "span> menu\n"
+#| "with the name you gave it.\n"
msgid ""
-"You can access this new volume from the <span class=\"guimenu\">Places</span> menu\n"
-"with the name you gave it.\n"
+"You can open this new partition from the sidebar of the file browser with "
+"the name you gave it."
msgstr ""
-"حالا می‌توانید از فهرست <span class=\"guimenu\">Places</span> با همان نامی که به آن درایو داده بودید\n"
+"حالا می‌توانید از فهرست <span class=\"guimenu\">Places</span> با همان نامی که "
+"به آن درایو داده بودید\n"
"به آن دسترسی پیدا کنید.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
-msgstr "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+msgid ""
+"After opening the partition with the file browser, you can also access it\n"
+"from the <span class=\"guimenu\">Places</span> menu.\n"
+msgstr ""
#. type: Title =
#, no-wrap
@@ -307,40 +368,26 @@ msgid "Open an existing encrypted partition\n"
msgstr "باز کردن یک درایو رمزگذاری‌شدهٔ موجود\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "When plugging a device containing an encrypted partition, Tails does not mount it\n"
-#| "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-#| "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-#| "like in the example, you can use its size to guess which one is the one you want\n"
-#| "to open.\n"
-msgid ""
-"When plugging in a device containing an encrypted partition, Tails does not mount it\n"
-"automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-"menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-"like in the example, you can use their sizes to guess which one is the one you want\n"
-"to open.\n"
-msgstr ""
-"هنگام وصل کردن یک دستگاه دارای پارتیشن رمزگذاری‌شده، تیلز آن را خودکار راه‌اندازی نمی‌کند\n"
-"اما این پارتیشن در فهرست <span class=\"guimenu\">Places</span> دیده می‌شود.\n"
-"اگر مانند مثال چندین پارتیشن <span class=\"guimenu\">رمزگذاری‌شده</span> دیده می‌شوند،\n"
-"می‌توانید از گنجایش آن حدس بزنید که پارتیشن مورد نظر شما\n"
-"کدام است.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
-msgstr "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+msgid ""
+"When plugging in a device containing an encrypted partition, Tails does not "
+"open the partition automatically but you can do so from the file browser."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Once you are done using the device, to close the encrypted partition choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Computer</span></span>,\n"
+#| "right-click on the device, and select <span class=\"guilabel\">Safely\n"
+#| "Remove Drive</span>.\n"
msgid ""
-"Once you are done using the device, to close the encrypted partition choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Computer</span></span>,\n"
-"right-click on the device, and select <span class=\"guilabel\">Safely\n"
-"Remove Drive</span>.\n"
+"1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Computer</span></span>\n"
+" to open the file browser.\n"
msgstr ""
"برای بستن پارتیشن رمزگذاری‌شده پس از تمام شدن کارتان ابتدا از این مسیر بروید:\n"
"<span class=\"menuchoice\">\n"
@@ -349,6 +396,53 @@ msgstr ""
"و سپس روی دستگاه راست‌کلیک کرده و <span class=\"guilabel\">جدا کردن امن دستگاه</span>\n"
"را انتخاب کنید.\n"
+#. type: Bullet: '1. '
+msgid "Click on the encrypted partition that you want to open in the sidebar."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+msgid " [[!img nautilus_encrypted.png link=\"no\" alt=\"File browser with '4.0 GB Encrypted' entry in the sidebar\"]]\n"
+msgstr "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+
+#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Enter a passphrase for the new partition in the <span class=\"guilabel"
+#| "\">Enter passphrase</span> dialog box. Then click on the <span class="
+#| "\"button\">Create</span> button."
+msgid ""
+"Enter the passphrase of the partition in the password prompt and click <span "
+"class=\"button\">Unlock</span>."
+msgstr ""
+"در پنجرهٔ <span class=\"guilabel\">وارد کردن گذرواژه</span> برای پارتیشن جدید "
+"یک گذرواژهٔ جدید انتخاب کنید. سپس روی دکمهٔ <span class=\"button\">ایجاد</"
+"span> کلیک کنید."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you choose the option <span class=\"guilabel\">Remember Password</span> and have\n"
+" the <span class=\"guilabel\">[[GNOME Keyring|first_steps/persistence/configure#gnome_keyring]]</span>\n"
+" persistence feature activated, the password is stored in the persistent storage and remembered across multiple\n"
+" working sessions.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After opening the partition with the file browser, you can also access it "
+"from the <span class=\"guimenu\">Places</span> menu."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"To close the partition after you finished using it, click on the <span class="
+"\"guimenu\">[[!img lib/media-eject.png alt=\"Eject\" class=\"symbolic\" link="
+"\"no\"]]</span> button next to the partition in the sidebar of the file "
+"browser."
+msgstr ""
+
#. type: Title =
#, no-wrap
msgid "Storing sensitive documents\n"
@@ -379,3 +473,70 @@ msgstr ""
"کار ممکن است باعث به مخاطره افتادن امنیت شما شود. احتمالاً نباید به "
"سیستم‌عامل‌های دیگر برای استفاده از اطلاعات مهم شما یا باقی نگذاشتن ردپا "
"اعتماد کرد."
+
+#~ msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-two\">دستگاه را فرمت کنید</h2>\n"
+
+#~ msgid ""
+#~ " 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
+#~ " existing partitions on the device.\n"
+#~ msgstr ""
+#~ " ۱. روی <span class=\"guilabel\">Format Drive</span> کلیک کنید\n"
+#~ " تا تمام پارتیشن‌های موجود روی دستگاه پاک شوند.\n"
+
+#~ msgid ""
+#~ " 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
+#~ " you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span> selected.\n"
+#~ msgstr ""
+#~ " ۱. در پنجرهٔ گفتگو <span class=\"guilabel\">Scheme</span> را انتخاب کنید.\n"
+#~ " اگر مطمئن نیستید گزینهٔ پیش‌فرض <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span> را دست‌نخورده باقی بگذارید.\n"
+
+#~ msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-three\">ایجاد یک پارتیشن جدید رمزگذاری‌شده</h2>\n"
+
+#~ msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+#~ msgstr " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Type</span>. You can change the file system type "
+#~ "of the partition. If you are not sure you can leave the default value: "
+#~ "<span class=\"guilabel\">Ext4</span>."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">نوع</span>. می‌توانید نوع سیستم فایل پارتیشن را "
+#~ "تغییر دهید. اگر از انتخاب خود مطمئن نیستید می‌توانید میزان پیش‌فرض <span "
+#~ "class=\"guilabel\">Ext4</span> را دست‌نخورده باقی بگذارید."
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
+#~ "option to encrypt the partition."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">رمزگذاری دستگاه</span>. از این گزینه برای "
+#~ "رمزگذاری پارتیشن استفاده کنید."
+
+#~ msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-four\">استفاده از پارتیشن جدید</h2>\n"
+
+#~ msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+#~ msgstr "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "When plugging a device containing an encrypted partition, Tails does not mount it\n"
+#~| "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
+#~| "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
+#~| "like in the example, you can use its size to guess which one is the one you want\n"
+#~| "to open.\n"
+#~ msgid ""
+#~ "When plugging in a device containing an encrypted partition, Tails does not mount it\n"
+#~ "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
+#~ "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
+#~ "like in the example, you can use their sizes to guess which one is the one you want\n"
+#~ "to open.\n"
+#~ msgstr ""
+#~ "هنگام وصل کردن یک دستگاه دارای پارتیشن رمزگذاری‌شده، تیلز آن را خودکار راه‌اندازی نمی‌کند\n"
+#~ "اما این پارتیشن در فهرست <span class=\"guimenu\">Places</span> دیده می‌شود.\n"
+#~ "اگر مانند مثال چندین پارتیشن <span class=\"guimenu\">رمزگذاری‌شده</span> دیده می‌شوند،\n"
+#~ "می‌توانید از گنجایش آن حدس بزنید که پارتیشن مورد نظر شما\n"
+#~ "کدام است.\n"
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
index e99672a..0725e65 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSIONx\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-02-04 15:54+0100\n"
"PO-Revision-Date: 2015-06-12 11:41-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,8 +53,8 @@ msgstr ""
#| "The GNOME <span class=\"application\">Disk Utility</span>, allows you to "
#| "create encrypted volumes."
msgid ""
-"The GNOME <span class=\"application\">Disk Utility</span> allows you to "
-"create encrypted volumes."
+"<span class=\"application\">GNOME Disks</span> allows you to create "
+"encrypted volumes."
msgstr ""
"L'<span class=\"application\">Utilitaire de disque</span> de GNOME vous "
"permet de créer des supports chiffrés."
@@ -85,8 +85,9 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=1]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!toc levels=1]]\n"
+msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
@@ -95,13 +96,19 @@ msgid "Create an encrypted partition\n"
msgstr "Créer une partition chiffrée\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
msgid ""
-"To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+"To open <span class=\"application\">GNOME Disks</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
"Pour ouvrir l'<span class=\"application\">Utilitaire de disque</span> de GNOME, choisissez\n"
"<span class=\"menuchoice\">\n"
@@ -109,15 +116,19 @@ msgstr ""
" <span class=\"guisubmenu\">Accessoires</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Utilitaire de disque</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+msgid "Identify your external storage device\n"
msgstr "<h2 class=\"bullet-number-one\">Identifier votre périphérique de stockage</h2>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices on the left side of the screen.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+"<span class=\"application\">Disks</span> lists all the current storage\n"
"devices on the left side of the screen.\n"
msgstr ""
"L'<span class=\"application\">Utilitaire de disque</span> de GNOME liste\n"
@@ -144,11 +155,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
-msgstr "<h2 class=\"bullet-number-two\">Formater le périphérique</h2>\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
" 1. Check that the description of the device on the right side of the screen\n"
" corresponds to your device: its brand, its size, etc.\n"
@@ -156,35 +162,65 @@ msgstr ""
" 1. Vérifiez que la description du périphérique sur le côté droit de l'écran\n"
" correspond à votre périphérique : sa marque, sa taille, etc.\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
+msgid "Format the device\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-" 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
-" existing partitions on the device.\n"
+"Click on the <span class=\"guimenu\">[[!img lib/emblem-system.png alt="
+"\"System\" class=\"symbolic\" link=\"no\"]]</span> button in the titlebar "
+"and choose <span class=\"guilabel\">Format…</span> to erase all the existing "
+"partitions on the device."
msgstr ""
-" 1. Cliquez sur <span class=\"guilabel\">Formater le disque</span> pour effacer\n"
-" toutes les partitions existantes sur le périphérique.\n"
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Format Disk</span> dialog:"
+msgstr "Cliquez sur <span class=\"guilabel\">Créer une partition</span>."
+
+#. type: Bullet: ' - '
msgid ""
-" 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
-" you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
-" Record</span> selected.\n"
+"If you want to erase all data securely, choose to <span class=\"guilabel"
+"\">Overwrite existing data with zeroes</span> in the <span class=\"guilabel"
+"\">Erase</span> drop-down list."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Choose <span class=\"guilabel\">Compatible with all systems and devices (MBR/"
+"DOS)</span> in the <span class=\"guilabel\">Partitioning</span> drop-down "
+"list."
msgstr ""
-" 1. Dans la boîte de dialogue pour sélectionner le <span class=\"guilabel\">Schéma</span>, si\n"
-" vous avez un doute, laissez l'option par défaut, <span class=\"guilabel\">Master Boot\n"
-" Record</span>.\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-three\">Créer une nouvelle partition chiffrée</h2>\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Format…</span>.\n"
+msgstr " Cliquez ensuite sur le bouton <span class=\"button\">Créer</span>.\n"
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, make sure that the device is correct. Click "
+"<span class=\"button\">Format</span> to confirm."
+msgstr ""
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Create an encrypted partition\n"
+msgid "Create a new encrypted partition\n"
+msgstr "Créer une partition chiffrée\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Now the schema of the partitions in the middle of the screen shows an "
+#| "empty device."
msgid ""
"Now the schema of the partitions in the middle of the screen shows an empty "
-"device."
+"device:"
msgstr ""
"Maintenant, le schéma des partitions au milieu de l'écran présente un disque "
"vide."
@@ -195,42 +231,49 @@ msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
msgstr "[[!img empty_device.fr.png link=no alt=\"4.0 GB Libres\"]]\n"
#. type: Bullet: ' 1. '
-msgid "Click on <span class=\"guilabel\">Create Partition</span>."
-msgstr "Cliquez sur <span class=\"guilabel\">Créer une partition</span>."
+msgid ""
+"Click on the <span class=\"guimenu\">[[!img lib/list-add.png alt=\"Create "
+"partition\" class=\"symbolic\" link=\"no\"]]</span> button to create a new "
+"partition on the device."
+msgstr ""
#. type: Bullet: ' 1. '
-msgid "Configure the new partition:"
-msgstr "Configurez la nouvelle partition :"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
-msgstr " [[!img create_partition.fr.png link=no alt=\"Créer une partition sur…\"]]\n"
+#, fuzzy
+#| msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid "In the <span class=\"guilabel\">Create Partition</span> dialog:"
+msgstr "Cliquez sur <span class=\"guilabel\">Créer une partition</span>."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Size</span>. You can decide to create a "
+#| "partition on the whole device or just on part of it. In this example we "
+#| "are creating a partition of 2.0 GB on a device of 3.9 GB."
msgid ""
-"<span class=\"guilabel\">Size</span>. You can decide to create a partition "
-"on the whole device or just on part of it. In this example we are creating a "
-"partition of 2.0 GB on a device of 3.9 GB."
+"<span class=\"guilabel\">Partition Size</span>: you can create a partition "
+"on the whole device or only on part of it. In this example we are creating a "
+"partition of 4.0 GB on a device of 8.1 GB."
msgstr ""
"<span class=\"guilabel\">Taille</span>. Vous pouvez décider de créer une "
"partition sur le disque entier ou sur une partie de celui-ci. Dans cet "
"exemple nous allons créer une partition de 2.0GB sur un périphérique de "
"3.9GB."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Type</span>. You can change the file system type of "
-"the partition. If you are not sure you can leave the default value: <span "
-"class=\"guilabel\">Ext4</span>."
+"<span class=\"guilabel\">Type</span>: choose <span class=\"guilabel"
+"\">Encrypted, compatible with Linux systems (LUKS + Ext4)</span> from the "
+"drop-down list."
msgstr ""
-"<span class=\"guilabel\">Type</span>. Vous pouvez choisir le système de "
-"fichiers de la partition. Si vous n'êtes pas sûr, vous pouvez laisser la "
-"valeur par défaut : <span class=\"guilabel\">Ext4</span>."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"guilabel\">Name</span>. You can set a name for the "
+#| "partition. This name remains invisible until the partition is open but "
+#| "can help you to identify it during use."
msgid ""
-"<span class=\"guilabel\">Name</span>. You can set a name for the partition. "
+"<span class=\"guilabel\">Name</span>: you can set a name for the partition. "
"This name remains invisible until the partition is open but can help you to "
"identify it during use."
msgstr ""
@@ -238,71 +281,89 @@ msgstr ""
"partition. Ce nom n'apparaîtra pas avant que votre partition ne soit ouverte "
"mais vous aidera à l'identifier lorsque vous l'utiliserez."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
-"option to encrypt the partition."
+"<span class=\"guilabel\">Passphrase</span>: type a passphrase for the "
+"encrypted partition and repeat it to confirm."
msgstr ""
-"<span class=\"guilabel\">Chiffrer le périphérique correspondant</span>. "
-"Sélectionnez cette option pour chiffrer la partition."
#. type: Plain text
-#, no-wrap
-msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+#, fuzzy, no-wrap
+#| msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Create</span>.\n"
msgstr " Cliquez ensuite sur le bouton <span class=\"button\">Créer</span>.\n"
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Enter a passphrase for the new partition in the <span class=\"guilabel"
-"\">Enter passphrase</span> dialog box. Then click on the <span class=\"button"
-"\">Create</span> button."
+" <div class=\"bug\">\n"
+" <p>If an error occurs while creating the new partition, try to unplug the\n"
+" device, restart <span class=\"application\">GNOME Disks</span>,\n"
+" and follow all steps again from the beginning.</p>\n"
+" </div>\n"
msgstr ""
-"Saisissez une phrase de passe pour la nouvelle partition dans la fenêtre "
-"intitulée <span class=\"guilabel\">Saississez la phrase de passe</span>. "
-"Cliquez ensuite sur le bouton <span class=\"button\">Créer</span>."
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "Creating the partition takes from a few seconds to a few minutes. After "
+#| "that, the new encrypted partition appears in the volumes of the device:"
msgid ""
"Creating the partition takes from a few seconds to a few minutes. After "
-"that, the new encrypted partition appears in the volumes of the device:"
+"that, the new encrypted partition appears in the volumes on the device:"
msgstr ""
"La création de la partition devrait prendre entre quelques secondes et "
"quelques minutes. Après cela, la nouvelle partition chiffrée apparaît dans "
"les volumes du périphérique :"
#. type: Plain text
-#, no-wrap
-msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+#, fuzzy, no-wrap
+#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
msgstr " [[!img encrypted_partition.fr.png link=no alt=\"2.0 GB chiffés / 2.0 GB secret ext4\"]]\n"
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "At this point you can create other partitions in the free space left on "
+#| "the device, if you want, by clicking on it and doing again <span class="
+#| "\"guilabel\">Create Partition</span>."
msgid ""
-"At this point you can create other partitions in the free space left on the "
-"device, if you want, by clicking on it and doing again <span class=\"guilabel"
-"\">Create Partition</span>."
+"If you want to create another partition in the free space on the device, "
+"click on the free space and then click on the <span class=\"guimenu\">[[!img "
+"lib/list-add.png alt=\"Create partition\" class=\"symbolic\" link=\"no\"]]</"
+"span> button again."
msgstr ""
"Vous pouvez alors, si vous le souhaitez, créer d'autres partitions sur "
"l'espace libre en le sélectionnant et en cliquant de nouveau sur <span class="
"\"guilabel\">Créer une partition</span>."
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
-msgstr "<h2 class=\"bullet-number-four\">Utiliser la nouvelle partition</h2>\n"
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Configure the new partition:"
+msgid "Use the new partition\n"
+msgstr "Configurez la nouvelle partition :"
#. type: Plain text
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "You can access this new volume from the <span class=\"guimenu\">Places</"
+#| "span> menu\n"
+#| "with the name you gave it.\n"
msgid ""
-"You can access this new volume from the <span class=\"guimenu\">Places</span> menu\n"
-"with the name you gave it.\n"
+"You can open this new partition from the sidebar of the file browser with "
+"the name you gave it."
msgstr ""
-"Vous pouvez accéder à cette partition depuis le menu <span class=\"guimenu\">Raccourcis</span>,\n"
+"Vous pouvez accéder à cette partition depuis le menu <span class=\"guimenu"
+"\">Raccourcis</span>,\n"
"puis en cliquant sur le nom que vous lui avez donné.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
-msgstr "[[!img places_secret.png link=no alt=\"Raccourcis&nbsp;▸ secret\"]]\n"
+msgid ""
+"After opening the partition with the file browser, you can also access it\n"
+"from the <span class=\"guimenu\">Places</span> menu.\n"
+msgstr ""
#. type: Title =
#, no-wrap
@@ -310,39 +371,26 @@ msgid "Open an existing encrypted partition\n"
msgstr "Ouvrir une partition existante\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "When plugging a device containing an encrypted partition, Tails does not mount it\n"
-#| "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-#| "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-#| "like in the example, you can use its size to guess which one is the one you want\n"
-#| "to open.\n"
-msgid ""
-"When plugging in a device containing an encrypted partition, Tails does not mount it\n"
-"automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-"menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-"like in the example, you can use their sizes to guess which one is the one you want\n"
-"to open.\n"
-msgstr ""
-"Lorsque vous branchez un périphérique contenant une partition chiffrée, Tails ne la montera pas\n"
-"automatiquement mais elle apparaîtra dans le menu <span class=\"guimenu\">Raccourcis</span>.\n"
-"Si plusieurs partitions apparaissent comme <span class=\"guimenu\">chiffrées</span>, comme\n"
-"dans cet exemple, vous pouvez utiliser la taille pour déduire laquelle vous souhaitez ouvrir.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
-msgstr "[[!img places_encrypted.png link=no alt=\"Raccourcis&nbsp;▸ 2.0 GB chiffrés\"]]\n"
+msgid ""
+"When plugging in a device containing an encrypted partition, Tails does not "
+"open the partition automatically but you can do so from the file browser."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Once you are done using the device, to close the encrypted partition choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Computer</span></span>,\n"
+#| "right-click on the device, and select <span class=\"guilabel\">Safely\n"
+#| "Remove Drive</span>.\n"
msgid ""
-"Once you are done using the device, to close the encrypted partition choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Computer</span></span>,\n"
-"right-click on the device, and select <span class=\"guilabel\">Safely\n"
-"Remove Drive</span>.\n"
+"1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Computer</span></span>\n"
+" to open the file browser.\n"
msgstr ""
"Lorsque vous avez fini d'utiliser votre périphérique, vous pouvez le retirer en utilisant\n"
"<span class=\"menuchoice\">\n"
@@ -351,6 +399,53 @@ msgstr ""
"effectuez un clic-droit sur votre périphérique, puis choisissez\n"
"<span class=\"guilabel\">Retirer le volume sans risque</span>.\n"
+#. type: Bullet: '1. '
+msgid "Click on the encrypted partition that you want to open in the sidebar."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+msgid " [[!img nautilus_encrypted.png link=\"no\" alt=\"File browser with '4.0 GB Encrypted' entry in the sidebar\"]]\n"
+msgstr "[[!img places_encrypted.png link=no alt=\"Raccourcis&nbsp;▸ 2.0 GB chiffrés\"]]\n"
+
+#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Enter a passphrase for the new partition in the <span class=\"guilabel"
+#| "\">Enter passphrase</span> dialog box. Then click on the <span class="
+#| "\"button\">Create</span> button."
+msgid ""
+"Enter the passphrase of the partition in the password prompt and click <span "
+"class=\"button\">Unlock</span>."
+msgstr ""
+"Saisissez une phrase de passe pour la nouvelle partition dans la fenêtre "
+"intitulée <span class=\"guilabel\">Saississez la phrase de passe</span>. "
+"Cliquez ensuite sur le bouton <span class=\"button\">Créer</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you choose the option <span class=\"guilabel\">Remember Password</span> and have\n"
+" the <span class=\"guilabel\">[[GNOME Keyring|first_steps/persistence/configure#gnome_keyring]]</span>\n"
+" persistence feature activated, the password is stored in the persistent storage and remembered across multiple\n"
+" working sessions.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After opening the partition with the file browser, you can also access it "
+"from the <span class=\"guimenu\">Places</span> menu."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"To close the partition after you finished using it, click on the <span class="
+"\"guimenu\">[[!img lib/media-eject.png alt=\"Eject\" class=\"symbolic\" link="
+"\"no\"]]</span> button next to the partition in the sidebar of the file "
+"browser."
+msgstr ""
+
#. type: Title =
#, no-wrap
msgid "Storing sensitive documents\n"
@@ -384,6 +479,72 @@ msgstr ""
"sûrs pour prendre en charge des informations sensibles ou ne pas laisser de "
"trace."
+#~ msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-two\">Formater le périphérique</h2>\n"
+
+#~ msgid ""
+#~ " 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
+#~ " existing partitions on the device.\n"
+#~ msgstr ""
+#~ " 1. Cliquez sur <span class=\"guilabel\">Formater le disque</span> pour effacer\n"
+#~ " toutes les partitions existantes sur le périphérique.\n"
+
+#~ msgid ""
+#~ " 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
+#~ " you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span> selected.\n"
+#~ msgstr ""
+#~ " 1. Dans la boîte de dialogue pour sélectionner le <span class=\"guilabel\">Schéma</span>, si\n"
+#~ " vous avez un doute, laissez l'option par défaut, <span class=\"guilabel\">Master Boot\n"
+#~ " Record</span>.\n"
+
+#~ msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-three\">Créer une nouvelle partition chiffrée</h2>\n"
+
+#~ msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
+#~ msgstr " [[!img create_partition.fr.png link=no alt=\"Créer une partition sur…\"]]\n"
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Type</span>. You can change the file system type "
+#~ "of the partition. If you are not sure you can leave the default value: "
+#~ "<span class=\"guilabel\">Ext4</span>."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">Type</span>. Vous pouvez choisir le système de "
+#~ "fichiers de la partition. Si vous n'êtes pas sûr, vous pouvez laisser la "
+#~ "valeur par défaut : <span class=\"guilabel\">Ext4</span>."
+
+#~ msgid ""
+#~ "<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
+#~ "option to encrypt the partition."
+#~ msgstr ""
+#~ "<span class=\"guilabel\">Chiffrer le périphérique correspondant</span>. "
+#~ "Sélectionnez cette option pour chiffrer la partition."
+
+#~ msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
+#~ msgstr "<h2 class=\"bullet-number-four\">Utiliser la nouvelle partition</h2>\n"
+
+#~ msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+#~ msgstr "[[!img places_secret.png link=no alt=\"Raccourcis&nbsp;▸ secret\"]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "When plugging a device containing an encrypted partition, Tails does not mount it\n"
+#~| "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
+#~| "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
+#~| "like in the example, you can use its size to guess which one is the one you want\n"
+#~| "to open.\n"
+#~ msgid ""
+#~ "When plugging in a device containing an encrypted partition, Tails does not mount it\n"
+#~ "automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
+#~ "menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
+#~ "like in the example, you can use their sizes to guess which one is the one you want\n"
+#~ "to open.\n"
+#~ msgstr ""
+#~ "Lorsque vous branchez un périphérique contenant une partition chiffrée, Tails ne la montera pas\n"
+#~ "automatiquement mais elle apparaîtra dans le menu <span class=\"guimenu\">Raccourcis</span>.\n"
+#~ "Si plusieurs partitions apparaissent comme <span class=\"guimenu\">chiffrées</span>, comme\n"
+#~ "dans cet exemple, vous pouvez utiliser la taille pour déduire laquelle vous souhaitez ouvrir.\n"
+
#~ msgid ""
#~ "<p>[[Administration\n"
#~ "privileges|first_steps/startup_options/administration_password]] are "
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
index 79bada5..c035c1e 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
@@ -6,7 +6,7 @@ encrypted volume: a dedicated partition on a USB stick or external hard-disk.
Tails comes with utilities for LUKS, a standard for disk-encryption under Linux.
- - The GNOME <span class="application">Disk Utility</span> allows you to
+ - <span class="application">GNOME Disks</span> allows you to
create encrypted volumes.
- The GNOME desktop allows you to open encrypted volumes.
@@ -17,20 +17,21 @@ Tails comes with utilities for LUKS, a standard for disk-encryption under Linux.
</div>
-[[!toc levels=1]]
+[[!toc levels=2]]
Create an encrypted partition
=============================
-To open the GNOME <span class="application">Disk Utility</span> choose
+To open <span class="application">GNOME Disks</span> choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">Disk Utility</span></span>.
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Disks</span></span>.
-<h2 class="bullet-number-one">Identify your external storage device</h2>
+Identify your external storage device
+-------------------------------------
-<span class="application">Disk Utility</span> lists all the current storage
+<span class="application">Disks</span> lists all the current storage
devices on the left side of the screen.
1. Plug in the external storage device that you want to use.
@@ -40,82 +41,116 @@ devices on the left side of the screen.
[[!img storage_devices_after.png link=no alt="A new storage device appeared
in the list"]]
-<h2 class="bullet-number-two">Format the device</h2>
-
1. Check that the description of the device on the right side of the screen
corresponds to your device: its brand, its size, etc.
- 1. Click on <span class="guilabel">Format Drive</span> to erase all the
- existing partitions on the device.
+Format the device
+-----------------
+
+ 1. Click on the <span class="guimenu">[[!img lib/emblem-system.png alt="System" class="symbolic" link="no"]]</span> button
+ in the titlebar and choose <span class="guilabel">Format…</span>
+ to erase all the existing partitions on the device.
+
+ 1. In the <span class="guilabel">Format Disk</span> dialog:
+
+ - If you want to erase all data securely, choose to
+ <span class="guilabel">Overwrite existing data with zeroes</span> in the
+ <span class="guilabel">Erase</span> drop-down list.
- 1. In the dialog box to select the <span class="guilabel">Scheme</span>, if
- you are unsure, leave the default option <span class="guilabel">Master Boot
- Record</span> selected.
+ - Choose <span class="guilabel">Compatible with all
+ systems and devices (MBR/DOS)</span> in the <span class="guilabel">Partitioning</span>
+ drop-down list.
-<h2 class="bullet-number-three">Create a new encrypted partition</h2>
+ Then click <span class="button">Format…</span>.
+
+ 1. In the confirmation dialog, make sure that the device
+ is correct. Click <span class="button">Format</span> to confirm.
+
+Create a new encrypted partition
+--------------------------------
Now the schema of the partitions in the middle of the screen shows an empty
-device.
+device:
[[!img empty_device.png link=no alt="Free 3.9 GB"]]
- 1. Click on <span class="guilabel">Create Partition</span>.
+ 1. Click on the <span class="guimenu">[[!img lib/list-add.png alt="Create partition" class="symbolic" link="no"]]</span>
+ button to create a new partition on the device.
+
+ 1. In the <span class="guilabel">Create Partition</span> dialog:
- 1. Configure the new partition:
+ - <span class="guilabel">Partition Size</span>: you can create a partition
+ on the whole device or only on part of it. In this example we are
+ creating a partition of 4.0 GB on a device of 8.1 GB.
- [[!img create_partition.png link=no alt="Create partition on…"]]
+ - <span class="guilabel">Type</span>: choose
+ <span class="guilabel">Encrypted, compatible with Linux systems (LUKS + Ext4)</span>
+ from the drop-down list.
- - <span class="guilabel">Size</span>. You can decide to create a partition
- on the whole device or just on part of it. In this example we are creating
- a partition of 2.0 GB on a device of 3.9 GB.
- - <span class="guilabel">Type</span>. You can change the file system type of
- the partition. If you are not sure you can leave the default value:
- <span class="guilabel">Ext4</span>.
- - <span class="guilabel">Name</span>. You can set a name for the partition.
- This name remains invisible until the partition is open but can help
- you to identify it during use.
- - <span class="guilabel">Encrypt underlying device</span>. Select this
- option to encrypt the partition.
+ - <span class="guilabel">Name</span>: you can set a name for the partition.
+ This name remains invisible until the partition is open but can help
+ you to identify it during use.
- Then click on the <span class="button">Create</span> button.
+ - <span class="guilabel">Passphrase</span>: type a passphrase for the
+ encrypted partition and repeat it to confirm.
- 1. Enter a passphrase for the new partition in the
- <span class="guilabel">Enter passphrase</span> dialog box. Then click on
- the <span class="button">Create</span> button.
+ Then click <span class="button">Create</span>.
+
+ <div class="bug">
+ <p>If an error occurs while creating the new partition, try to unplug the
+ device, restart <span class="application">GNOME Disks</span>,
+ and follow all steps again from the beginning.</p>
+ </div>
1. Creating the partition takes from a few seconds to a few minutes. After
- that, the new encrypted partition appears in the volumes of the device:
+ that, the new encrypted partition appears in the volumes on the device:
- [[!img encrypted_partition.png link=no alt="Encrypted 2.0 GB / secret 2.0 GB ext4"]]
+ [[!img encrypted_partition.png link="no" alt="Encrypted 2.0 GB / secret 2.0 GB ext4"]]
- 1. At this point you can create other partitions in the free space left on the
- device, if you want, by clicking on it and doing again
- <span class="guilabel">Create Partition</span>.
+ 1. If you want to create another partition in the free space on the
+ device, click on the free space and then click on the
+ <span class="guimenu">[[!img lib/list-add.png alt="Create partition" class="symbolic" link="no"]]</span>
+ button again.
-<h2 class="bullet-number-four">Use the new partition</h2>
+Use the new partition
+---------------------
-You can access this new volume from the <span class="guimenu">Places</span> menu
-with the name you gave it.
+You can open this new partition from the sidebar of the file browser with the
+name you gave it.
-[[!img places_secret.png link=no alt="Places&nbsp;▸ secret"]]
+After opening the partition with the file browser, you can also access it
+from the <span class="guimenu">Places</span> menu.
Open an existing encrypted partition
====================================
-When plugging in a device containing an encrypted partition, Tails does not mount it
-automatically but it appears in the <span class="guimenu">Places</span>
-menu. If several partitions appear as <span class="guimenu">Encrypted</span>,
-like in the example, you can use their sizes to guess which one is the one you want
-to open.
+When plugging in a device containing an encrypted partition, Tails does not open the partition
+automatically but you can do so from the file browser.
-[[!img places_encrypted.png link=no alt="Places&nbsp;▸ 2.0 GB Encrypted"]]
+1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">Places</span>&nbsp;▸
+ <span class="guisubmenu">Computer</span></span>
+ to open the file browser.
-Once you are done using the device, to close the encrypted partition choose
-<span class="menuchoice">
- <span class="guimenu">Places</span>&nbsp;▸
- <span class="guisubmenu">Computer</span></span>,
-right-click on the device, and select <span class="guilabel">Safely
-Remove Drive</span>.
+1. Click on the encrypted partition that you want to open in the sidebar.
+
+ [[!img nautilus_encrypted.png link="no" alt="File browser with '4.0 GB Encrypted' entry in the sidebar"]]
+
+1. Enter the passphrase of the partition in the password prompt and
+ click <span class="button">Unlock</span>.
+
+ If you choose the option <span class="guilabel">Remember Password</span> and have
+ the <span class="guilabel">[[GNOME Keyring|first_steps/persistence/configure#gnome_keyring]]</span>
+ persistence feature activated, the password is stored in the persistent storage and remembered across multiple
+ working sessions.
+
+1. After opening the partition with the file browser, you can also access it
+ from the <span class="guimenu">Places</span> menu.
+
+1. To close the partition after you finished using it, click on the
+ <span class="guimenu">[[!img lib/media-eject.png alt="Eject" class="symbolic" link="no"]]</span>
+ button next to the partition in the sidebar of the file browser.
Storing sensitive documents
===========================
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po
index e7a2ad9..8838102 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-02-04 15:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,8 +37,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"The GNOME <span class=\"application\">Disk Utility</span> allows you to "
-"create encrypted volumes."
+"<span class=\"application\">GNOME Disks</span> allows you to create "
+"encrypted volumes."
msgstr ""
#. type: Bullet: ' - '
@@ -64,7 +64,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!toc levels=1]]\n"
+msgid "[[!toc levels=2]]\n"
msgstr ""
#. type: Title =
@@ -75,22 +75,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To open the GNOME <span class=\"application\">Disk Utility</span> choose\n"
+"To open <span class=\"application\">GNOME Disks</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span></span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Identify your external storage device</h2>\n"
+msgid "Identify your external storage device\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+"<span class=\"application\">Disks</span> lists all the current storage\n"
"devices on the left side of the screen.\n"
msgstr ""
@@ -111,40 +111,62 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Format the device</h2>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" 1. Check that the description of the device on the right side of the screen\n"
" corresponds to your device: its brand, its size, etc.\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
+msgid "Format the device\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-" 1. Click on <span class=\"guilabel\">Format Drive</span> to erase all the\n"
-" existing partitions on the device.\n"
+"Click on the <span class=\"guimenu\">[[!img lib/emblem-system.png alt="
+"\"System\" class=\"symbolic\" link=\"no\"]]</span> button in the titlebar "
+"and choose <span class=\"guilabel\">Format…</span> to erase all the existing "
+"partitions on the device."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the <span class=\"guilabel\">Format Disk</span> dialog:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If you want to erase all data securely, choose to <span class=\"guilabel"
+"\">Overwrite existing data with zeroes</span> in the <span class=\"guilabel"
+"\">Erase</span> drop-down list."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Choose <span class=\"guilabel\">Compatible with all systems and devices (MBR/"
+"DOS)</span> in the <span class=\"guilabel\">Partitioning</span> drop-down "
+"list."
msgstr ""
#. type: Plain text
#, no-wrap
+msgid " Then click <span class=\"button\">Format…</span>.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-" 1. In the dialog box to select the <span class=\"guilabel\">Scheme</span>, if\n"
-" you are unsure, leave the default option <span class=\"guilabel\">Master Boot\n"
-" Record</span> selected.\n"
+"In the confirmation dialog, make sure that the device is correct. Click "
+"<span class=\"button\">Format</span> to confirm."
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Create a new encrypted partition</h2>\n"
+msgid "Create a new encrypted partition\n"
msgstr ""
#. type: Plain text
msgid ""
"Now the schema of the partitions in the middle of the screen shows an empty "
-"device."
+"device:"
msgstr ""
#. type: Plain text
@@ -153,90 +175,93 @@ msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Click on <span class=\"guilabel\">Create Partition</span>."
+msgid ""
+"Click on the <span class=\"guimenu\">[[!img lib/list-add.png alt=\"Create "
+"partition\" class=\"symbolic\" link=\"no\"]]</span> button to create a new "
+"partition on the device."
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Configure the new partition:"
+msgid "In the <span class=\"guilabel\">Create Partition</span> dialog:"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid " [[!img create_partition.png link=no alt=\"Create partition on…\"]]\n"
-msgstr ""
-
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Size</span>. You can decide to create a partition "
-"on the whole device or just on part of it. In this example we are creating a "
-"partition of 2.0 GB on a device of 3.9 GB."
+"<span class=\"guilabel\">Partition Size</span>: you can create a partition "
+"on the whole device or only on part of it. In this example we are creating a "
+"partition of 4.0 GB on a device of 8.1 GB."
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Type</span>. You can change the file system type of "
-"the partition. If you are not sure you can leave the default value: <span "
-"class=\"guilabel\">Ext4</span>."
+"<span class=\"guilabel\">Type</span>: choose <span class=\"guilabel"
+"\">Encrypted, compatible with Linux systems (LUKS + Ext4)</span> from the "
+"drop-down list."
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Name</span>. You can set a name for the partition. "
+"<span class=\"guilabel\">Name</span>: you can set a name for the partition. "
"This name remains invisible until the partition is open but can help you to "
"identify it during use."
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
-"<span class=\"guilabel\">Encrypt underlying device</span>. Select this "
-"option to encrypt the partition."
+"<span class=\"guilabel\">Passphrase</span>: type a passphrase for the "
+"encrypted partition and repeat it to confirm."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Then click on the <span class=\"button\">Create</span> button.\n"
+msgid " Then click <span class=\"button\">Create</span>.\n"
msgstr ""
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Enter a passphrase for the new partition in the <span class=\"guilabel"
-"\">Enter passphrase</span> dialog box. Then click on the <span class=\"button"
-"\">Create</span> button."
+" <div class=\"bug\">\n"
+" <p>If an error occurs while creating the new partition, try to unplug the\n"
+" device, restart <span class=\"application\">GNOME Disks</span>,\n"
+" and follow all steps again from the beginning.</p>\n"
+" </div>\n"
msgstr ""
#. type: Bullet: ' 1. '
msgid ""
"Creating the partition takes from a few seconds to a few minutes. After "
-"that, the new encrypted partition appears in the volumes of the device:"
+"that, the new encrypted partition appears in the volumes on the device:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
msgstr ""
#. type: Bullet: ' 1. '
msgid ""
-"At this point you can create other partitions in the free space left on the "
-"device, if you want, by clicking on it and doing again <span class=\"guilabel"
-"\">Create Partition</span>."
+"If you want to create another partition in the free space on the device, "
+"click on the free space and then click on the <span class=\"guimenu\">[[!img "
+"lib/list-add.png alt=\"Create partition\" class=\"symbolic\" link=\"no\"]]</"
+"span> button again."
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Use the new partition</h2>\n"
+msgid "Use the new partition\n"
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"You can access this new volume from the <span class=\"guimenu\">Places</span> menu\n"
-"with the name you gave it.\n"
+"You can open this new partition from the sidebar of the file browser with "
+"the name you gave it."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img places_secret.png link=no alt=\"Places&nbsp;▸ secret\"]]\n"
+msgid ""
+"After opening the partition with the file browser, you can also access it\n"
+"from the <span class=\"guimenu\">Places</span> menu.\n"
msgstr ""
#. type: Title =
@@ -245,29 +270,57 @@ msgid "Open an existing encrypted partition\n"
msgstr ""
#. type: Plain text
+msgid ""
+"When plugging in a device containing an encrypted partition, Tails does not "
+"open the partition automatically but you can do so from the file browser."
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid ""
-"When plugging in a device containing an encrypted partition, Tails does not mount it\n"
-"automatically but it appears in the <span class=\"guimenu\">Places</span>\n"
-"menu. If several partitions appear as <span class=\"guimenu\">Encrypted</span>,\n"
-"like in the example, you can use their sizes to guess which one is the one you want\n"
-"to open.\n"
+"1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Computer</span></span>\n"
+" to open the file browser.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Click on the encrypted partition that you want to open in the sidebar."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img places_encrypted.png link=no alt=\"Places&nbsp;▸ 2.0 GB Encrypted\"]]\n"
+msgid " [[!img nautilus_encrypted.png link=\"no\" alt=\"File browser with '4.0 GB Encrypted' entry in the sidebar\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Enter the passphrase of the partition in the password prompt and click <span "
+"class=\"button\">Unlock</span>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"Once you are done using the device, to close the encrypted partition choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Computer</span></span>,\n"
-"right-click on the device, and select <span class=\"guilabel\">Safely\n"
-"Remove Drive</span>.\n"
+" If you choose the option <span class=\"guilabel\">Remember Password</span> and have\n"
+" the <span class=\"guilabel\">[[GNOME Keyring|first_steps/persistence/configure#gnome_keyring]]</span>\n"
+" persistence feature activated, the password is stored in the persistent storage and remembered across multiple\n"
+" working sessions.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After opening the partition with the file browser, you can also access it "
+"from the <span class=\"guimenu\">Places</span> menu."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"To close the partition after you finished using it, click on the <span class="
+"\"guimenu\">[[!img lib/media-eject.png alt=\"Eject\" class=\"symbolic\" link="
+"\"no\"]]</span> button next to the partition in the sidebar of the file "
+"browser."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png
deleted file mode 100644
index fb4e036..0000000
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png
deleted file mode 100644
index c93327b..0000000
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png
deleted file mode 100644
index b4acbff..0000000
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.png
index 78b0a53..0243142 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.png
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png
deleted file mode 100644
index 68ccc45..0000000
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.png
index 05edb7e..81cffd8 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.png
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/nautilus_encrypted.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/nautilus_encrypted.png
new file mode 100644
index 0000000..c0711bb
--- /dev/null
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/nautilus_encrypted.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.png
index 3118e4b..50c83bc 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.png
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_encrypted.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png
deleted file mode 100644
index 0fc38ed..0000000
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.png
index 486c315..0dfe0e5 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.png
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/storage_devices_after.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.de.po b/wiki/src/doc/encryption_and_privacy/keyringer.de.po
index 2b043f2..302daf9 100644
--- a/wiki/src/doc/encryption_and_privacy/keyringer.de.po
+++ b/wiki/src/doc/encryption_and_privacy/keyringer.de.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-04-19 18:45+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2016-01-27 21:41+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.6\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Verschlüsselte Geheimnisse mit keyringer austauschen\"]]\n"
#. type: Plain text
#, no-wrap
@@ -28,6 +28,9 @@ msgid ""
"an encrypted and distributed secret sharing software running from the\n"
"command line.\n"
msgstr ""
+"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> ist\n"
+"eine Software für verschlüsselte und verteilte Geheimnisse, die von der\n"
+"Kommandozeile aus läuft.\n"
#. type: Plain text
#, no-wrap
@@ -38,11 +41,17 @@ msgid ""
"documents. By storing those secrets in Git, you can share them with\n"
"other people in a distributed manner.\n"
msgstr ""
+"<span class=\"application\">Keyringer</span> erlaubt es Ihnen mit speziellen\n"
+"Befehlen für das Verschlüsseln, Entschlüsseln und Bearbeiten von Textdateien\n"
+"und anderen Dokumententypen, Geheimnisse unter der Benutzung von OpenPGP\n"
+"und [Git](http://git-scm.com/) zu verwalten und zu teilen. Durch das Speichern \n"
+"dieser Geheimnisse in Git können Sie diese mit anderen Menschen auf verteilte\n"
+"Weise teilen.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -50,22 +59,26 @@ msgid ""
"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
"knowledge of Git and the command line.</span>\n"
msgstr ""
+"<p>Die Benutzung von <span class=\"application\">keyringer</span> erfordert\n"
+"Vorkenntnisse in Git und der Kommandozeile.</span>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid ""
"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
"website](https://keyringer.pw/)."
msgstr ""
+"Um zu lernen, wie *keyringer* benutzt wird, lesen Sie die [Dokumentation auf "
+"der *keyringer*-Website](https://keyringer.pw/)."
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -75,6 +88,10 @@ msgid ""
"share <span class=\"application\">LibreOffice</span> documents,\n"
"images, etc.</p>\n"
msgstr ""
+"<p>Sie können den <span class=\"guilabel\">open</span>-Befehl von\n"
+"<span class=\"application\">keyringer</span> benutzen, um\n"
+"<span class=\"application\">LibreOffice</span>-Dokumente, Bilder usw. zu bearbeiten,\n"
+"verschlüsseln und teilen.</p>\n"
#. type: Plain text
#, no-wrap
@@ -86,10 +103,18 @@ msgid ""
"class=\"filename\">.keyringer</span> folder of your\n"
"<span class=\"filename\">Home</span> folder.\n"
msgstr ""
+"Um Ihre Konfiguration von *keyringer* über mehrere Arbeitssitzungen\n"
+"hinweg zu speichern, können Sie die Funktion für [[<span class=\"guilabel\">\n"
+"versteckte Konfigurationsdateien im beständigen Speicherbereich</span>\n"
+"|doc/first_steps/persistence/configure/#dotfiles]] und die Dateien im <span\n"
+"class=\"filename\">.keyringer</span>-Ordner Ihres\n"
+"<span class=\"filename\">Home</span>-Ordners beständig speichern.\n"
#. type: Plain text
msgid "For example, if you have a single keyringer named **top-secret**:"
msgstr ""
+"Beispielsweise, wenn Sie einen einzelnen keyringer namens **top-secret** "
+"haben:"
#. type: Plain text
#, no-wrap
@@ -99,18 +124,25 @@ msgid ""
"    ├── config\n"
"    └── top-secret\n"
msgstr ""
+" /live/persistence/TailsData_unlocked/dotfiles\n"
+" └── .keyringer\n"
+"    ├── config\n"
+"    └── top-secret\n"
#. type: Plain text
msgid ""
"Make sure to update your *dotfiles* each time you use the **init**, "
"**teardown**, **destroy**, or **preferences** command of *keyringer*."
msgstr ""
+"Stellen Sie sicher, Ihre *versteckten Konfigurationsdateien* jedes Mal zu "
+"aktualisieren, wenn Sie die **init**, **teardown**, **destroy**, oder "
+"**preferences** Befehle von *keyringer* benutzen."
#. type: Plain text
msgid "To do so you can execute the following command:"
-msgstr ""
+msgstr "Um dies zu tun, können Sie folgenden Befehl ausführen:"
#. type: Plain text
#, no-wrap
msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr ""
+msgstr " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po b/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po
index b7e8d5d..ec955ae 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-29 21:04+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"
@@ -149,7 +149,7 @@ msgstr ""
msgid ""
" 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
" from the <span class=\"guimenu\">Places</span> menu or the <span\n"
-" class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
#. type: Bullet: ' 1. '
@@ -207,7 +207,7 @@ msgstr ""
#. type: Bullet: ' 1. '
msgid ""
"Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> menu "
-"or the <span class=\"guilabel\">Computer</span> icon on the desktop."
+"or the <span class=\"guilabel\">home</span> icon on the desktop."
msgstr ""
#. type: Bullet: ' 1. '
@@ -274,7 +274,7 @@ msgstr ""
#, no-wrap
msgid ""
" 1. Open Nautilus, either from the <span class=\"guimenu\">Places</span> menu or\n"
-" the <span class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" the <span class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
#. type: Bullet: ' 1. '
@@ -315,11 +315,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Note that a file called <span\n"
-" class=\"filename\">oooooooo.ooo</span> is created in the\n"
-" folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
-" make it as big as possible to use all the available diskspace and\n"
-" then securely deletes it.\n"
+" <span class=\"application\">Nautilus Wipe</span> creates a folder\n"
+" named <span class=\"filename\">tmp.XXXXXXXXXX</span>, tries to make\n"
+" it as big as possible to use all the available diskspace, and then\n"
+" securely deletes it.\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po b/wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po
index f8bbb93..0723616 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-29 21:04+0100\n"
"PO-Revision-Date: 2015-10-14 19:35+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -179,11 +179,15 @@ msgstr ""
"امن پاک کنید."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
+#| " from the <span class=\"guimenu\">Places</span> menu or the <span\n"
+#| " class=\"guilabel\">Computer</span> icon on the desktop.\n"
msgid ""
" 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
" from the <span class=\"guimenu\">Places</span> menu or the <span\n"
-" class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
" ۱. مرورگر فایل <span class=\"application\">ناتیلوس</span> را از\n"
" فهرست <span class=\"guimenu\">Places</span> یا از نمایهٔ <span\n"
@@ -258,7 +262,7 @@ msgstr ""
#, fuzzy
msgid ""
"Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> menu "
-"or the <span class=\"guilabel\">Computer</span> icon on the desktop."
+"or the <span class=\"guilabel\">home</span> icon on the desktop."
msgstr ""
"*ناتیلوس* را از فهرست <span class=\"guimenu\">Places</span> یا نمایهٔ <span "
"class=\"guilabel\">رایانه</span> روی دسکتاپ باز کنید."
@@ -343,7 +347,7 @@ msgstr ""
#, fuzzy, no-wrap
msgid ""
" 1. Open Nautilus, either from the <span class=\"guimenu\">Places</span> menu or\n"
-" the <span class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" the <span class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
" ۱. ناتیلوس را از فهرست <span class=\"guimenu\">Places</span> یا\n"
" نمایهٔ <span class=\"guilabel\">رایانه</span> روی دسکتاپ باز کنید.\n"
@@ -396,13 +400,18 @@ msgstr ""
"چندین ساعت طول بکشد. صبور باشید…"
#. type: Plain text
-#, no-wrap
-msgid ""
-" Note that a file called <span\n"
-" class=\"filename\">oooooooo.ooo</span> is created in the\n"
-" folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
-" make it as big as possible to use all the available diskspace and\n"
-" then securely deletes it.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Note that a file called <span\n"
+#| " class=\"filename\">oooooooo.ooo</span> is created in the\n"
+#| " folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
+#| " make it as big as possible to use all the available diskspace and\n"
+#| " then securely deletes it.\n"
+msgid ""
+" <span class=\"application\">Nautilus Wipe</span> creates a folder\n"
+" named <span class=\"filename\">tmp.XXXXXXXXXX</span>, tries to make\n"
+" it as big as possible to use all the available diskspace, and then\n"
+" securely deletes it.\n"
msgstr ""
" دقت کنید که فایلی با نام <span\n"
" class=\"filename\">oooooooo.ooo</span> در آن پوشه ایجاد شده است.\n"
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po b/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
index 09ad383..a2eba67 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-29 21:04+0100\n"
"PO-Revision-Date: 2015-06-12 12:14-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -181,11 +181,15 @@ msgstr ""
"org/nautilus-wipe.html)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
+#| " from the <span class=\"guimenu\">Places</span> menu or the <span\n"
+#| " class=\"guilabel\">Computer</span> icon on the desktop.\n"
msgid ""
" 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
" from the <span class=\"guimenu\">Places</span> menu or the <span\n"
-" class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
" 1. Ouvrez le navigateur de fichiers <span class=\"application\">Nautilus</span>, soit\n"
" depuis le menu <span class=\"guimenu\">Raccourcis</span>, soit depuis l'icône <span\n"
@@ -259,9 +263,13 @@ msgstr ""
"secure_deletion#index5h1]], assurez-vous de bien vider la corbeille."
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> "
+#| "menu or the <span class=\"guilabel\">Computer</span> icon on the desktop."
msgid ""
"Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> menu "
-"or the <span class=\"guilabel\">Computer</span> icon on the desktop."
+"or the <span class=\"guilabel\">home</span> icon on the desktop."
msgstr ""
"Ouvrez *Nautilus*, soit depuis le menu <span class=\"guimenu\">Raccourcis</"
"span> ou par l'icône <span class=\"guilabel\">Computer</span> sur le bureau."
@@ -343,10 +351,13 @@ msgstr ""
"fichiers. Ceux-ci ne seront pas effacés durant l'opération."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open Nautilus, either from the <span class=\"guimenu\">Places</span> menu or\n"
+#| " the <span class=\"guilabel\">Computer</span> icon on the desktop.\n"
msgid ""
" 1. Open Nautilus, either from the <span class=\"guimenu\">Places</span> menu or\n"
-" the <span class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" the <span class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
" 1. Ouvrez Nautilus, soit depuis le menu <span class=\"guimenu\">Raccourcis</span> ou\n"
" par l'icône <span class=\"guilabel\">Computer</span> sur le bureau.\n"
@@ -400,13 +411,18 @@ msgstr ""
"selon l'espace libre présent sur le disque. Soyez patient.."
#. type: Plain text
-#, no-wrap
-msgid ""
-" Note that a file called <span\n"
-" class=\"filename\">oooooooo.ooo</span> is created in the\n"
-" folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
-" make it as big as possible to use all the available diskspace and\n"
-" then securely deletes it.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Note that a file called <span\n"
+#| " class=\"filename\">oooooooo.ooo</span> is created in the\n"
+#| " folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
+#| " make it as big as possible to use all the available diskspace and\n"
+#| " then securely deletes it.\n"
+msgid ""
+" <span class=\"application\">Nautilus Wipe</span> creates a folder\n"
+" named <span class=\"filename\">tmp.XXXXXXXXXX</span>, tries to make\n"
+" it as big as possible to use all the available diskspace, and then\n"
+" securely deletes it.\n"
msgstr ""
" Remarquez qu'un fichier appelé <span class=\"filename\">oooooooo.ooo</span> est\n"
" créé dans le dossier. <span class=\"application\">Nautilus Wipe</span> va en augmenter\n"
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn b/wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn
index a496f88..1194800 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn
@@ -64,7 +64,7 @@ Wipe](http://wipetools.tuxfamily.org/nautilus-wipe.html).
1. Open the <span class="application">Nautilus</span> file browser, either
from the <span class="guimenu">Places</span> menu or the <span
- class="guilabel">Computer</span> icon on the desktop.
+ class="guilabel">home</span> icon on the desktop.
1. Navigate to the folder containing the files that you want to delete.
@@ -96,7 +96,7 @@ Before considering [[securely cleaning the available space on a
disk|secure_deletion#index5h1]], make sure to empty the trash.
1. Open *Nautilus*, either from the <span class="guimenu">Places</span> menu or
- the <span class="guilabel">Computer</span> icon on the desktop.
+ the <span class="guilabel">home</span> icon on the desktop.
1. Click on the disk on which you want to empty the trash in the left
pane to navigate to the root of this disk.
@@ -135,7 +135,7 @@ The disk or the folder may or may not contain other files. Those files will not
be deleted during the operation.
1. Open Nautilus, either from the <span class="guimenu">Places</span> menu or
- the <span class="guilabel">Computer</span> icon on the desktop.
+ the <span class="guilabel">home</span> icon on the desktop.
1. Click on the disk that you want to clean in the left pane to
navigate to the root of this disk.
@@ -157,11 +157,10 @@ be deleted during the operation.
1. The cleaning starts. It can last from a few minutes to a few hours,
according to the size of the available diskspace. Be patient…
- Note that a file called <span
- class="filename">oooooooo.ooo</span> is created in the
- folder. <span class="application">Nautilus Wipe</span> tries to
- make it as big as possible to use all the available diskspace and
- then securely deletes it.
+ <span class="application">Nautilus Wipe</span> creates a folder
+ named <span class="filename">tmp.XXXXXXXXXX</span>, tries to make
+ it as big as possible to use all the available diskspace, and then
+ securely deletes it.
<div class="caution">
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po b/wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po
index b7e8d5d..ec955ae 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-29 21:04+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"
@@ -149,7 +149,7 @@ msgstr ""
msgid ""
" 1. Open the <span class=\"application\">Nautilus</span> file browser, either\n"
" from the <span class=\"guimenu\">Places</span> menu or the <span\n"
-" class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
#. type: Bullet: ' 1. '
@@ -207,7 +207,7 @@ msgstr ""
#. type: Bullet: ' 1. '
msgid ""
"Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> menu "
-"or the <span class=\"guilabel\">Computer</span> icon on the desktop."
+"or the <span class=\"guilabel\">home</span> icon on the desktop."
msgstr ""
#. type: Bullet: ' 1. '
@@ -274,7 +274,7 @@ msgstr ""
#, no-wrap
msgid ""
" 1. Open Nautilus, either from the <span class=\"guimenu\">Places</span> menu or\n"
-" the <span class=\"guilabel\">Computer</span> icon on the desktop.\n"
+" the <span class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
#. type: Bullet: ' 1. '
@@ -315,11 +315,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Note that a file called <span\n"
-" class=\"filename\">oooooooo.ooo</span> is created in the\n"
-" folder. <span class=\"application\">Nautilus Wipe</span> tries to\n"
-" make it as big as possible to use all the available diskspace and\n"
-" then securely deletes it.\n"
+" <span class=\"application\">Nautilus Wipe</span> creates a folder\n"
+" named <span class=\"filename\">tmp.XXXXXXXXXX</span>, tries to make\n"
+" it as big as possible to use all the available diskspace, and then\n"
+" securely deletes it.\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.png b/wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.png
index d15bf85..5a43793 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.png
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion/wipe_available_diskspace.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
index b68f71b..e076f79 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2014-12-04 17:21+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2016-01-23 13:52+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -94,12 +94,20 @@ msgstr ""
"administration_password]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
@@ -138,8 +146,9 @@ msgstr ""
" anders:\n"
#. type: Plain text
-#, no-wrap
-msgid " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
+#, fuzzy, no-wrap
+#| msgid " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
+msgid " cryptsetup open --type tcrypt /media/amnesia/mydisk/mycontainer myvolume\n"
msgstr " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
#. type: Plain text
@@ -183,8 +192,9 @@ msgstr ""
"mit dem im dritten Schritt gewählten Namen."
#. type: Plain text
-#, no-wrap
-msgid " mkdir /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mkdir /media/[name]\n"
+msgid " mkdir /media/amnesia/[name]\n"
msgstr " mkdir /media/[name]\n"
#. type: Plain text
@@ -193,8 +203,9 @@ msgid " a. And, if your volume contains a **NTFS or FAT file system** (default
msgstr " a. Und wenn Ihr Laufwerk ein **NTFS or FAT Dateisystem** enthält (Standard):\n"
#. type: Plain text
-#, no-wrap
-msgid " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
+msgid " mount -o uid=1000 /dev/mapper/[name] /media/amnesia/[name]\n"
msgstr " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
#. type: Plain text
@@ -203,8 +214,9 @@ msgid " a. Else, if your volume contains an **Ext2, Ext3, or Ext4 file system*
msgstr " a. Oder wenn Ihr Laufwerk ein **Ext2, Ext3, or Ext4 Dateisystem** enthält:\n"
#. type: Plain text
-#, no-wrap
-msgid " mount /dev/mapper/[name] /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mount /dev/mapper/[name] /media/[name]\n"
+msgid " mount /dev/mapper/[name] /media/amnesia/[name]\n"
msgstr " mount /dev/mapper/[name] /media/[name]\n"
#. type: Bullet: '1. '
@@ -227,9 +239,12 @@ msgstr ""
"zugeordneten Namen, den Sie im dritten Schritt ausgewählt haben."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " umount /media/[name]\n"
+#| " cryptsetup close [name]\n"
msgid ""
-" umount /media/[name]\n"
+" umount /media/amnesia/[name]\n"
" cryptsetup close [name]\n"
msgstr ""
" umount /media/[name]\n"
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.fa.po b/wiki/src/doc/encryption_and_privacy/truecrypt.fa.po
index 19a1a77..1aa6d31 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-01-11 21:42+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2015-10-14 17:02+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -96,12 +96,20 @@ msgstr ""
"administration_password]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po b/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
index f4ee00c..03c3f5d 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-22 12:54+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: 2015-01-19 16:50-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,12 +94,20 @@ msgstr ""
"administration_password]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
@@ -178,8 +186,8 @@ msgid ""
"chosen in step&nbsp;3."
msgstr ""
"Après avoir tapé votre mot de passe et une fois que l'invite de commande "
-"réapparaît, lancez les commandes suivantes pour monter le volume. Remplacer "
-"`[name]` par le nom choisit à l'étape&nbsp;3."
+"réapparaît, lancez les commandes suivantes pour monter le volume. Remplacer `"
+"[name]` par le nom choisit à l'étape&nbsp;3."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.mdwn b/wiki/src/doc/encryption_and_privacy/truecrypt.mdwn
index f00320c..bd9f4fe 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.mdwn
@@ -32,7 +32,7 @@ version 4.1 to 4.3 (November 2005 to March 2007).</p>
1. Choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
+ <span class="guisubmenu">System Tools</span>&nbsp;▸
<span class="guimenuitem">Root Terminal</span>
</span>
to open a terminal with administration rights.
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.pt.po b/wiki/src/doc/encryption_and_privacy/truecrypt.pt.po
index 8ad80c9..8ba6606 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-04 17:21+0100\n"
+"POT-Creation-Date: 2016-01-28 15:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,7 @@ msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
diff --git a/wiki/src/doc/first_steps/accessibility.de.po b/wiki/src/doc/first_steps/accessibility.de.po
index 1109bfb..efd4326 100644
--- a/wiki/src/doc/first_steps/accessibility.de.po
+++ b/wiki/src/doc/first_steps/accessibility.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-24 21:43+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translation Team <tails-l10n@boum.org>\n"
@@ -37,14 +37,21 @@ msgstr ""
"org/users/gnome-help/stable/a11y.html.de) Handbuch beschrieben ist."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgid ""
"To access those utilities choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Settings</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgstr ""
"Um auf diese Werkzeuge zuzugreifen wählen Sie\n"
diff --git a/wiki/src/doc/first_steps/accessibility.fa.po b/wiki/src/doc/first_steps/accessibility.fa.po
index 697fa36..70ab84f 100644
--- a/wiki/src/doc/first_steps/accessibility.fa.po
+++ b/wiki/src/doc/first_steps/accessibility.fa.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-09-26 10:31+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-16 14:37+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian "
-"<http://weblate.451f.org:8889/projects/tails/accessibility/fa/>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
+"accessibility/fa/>\n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,19 +35,26 @@ msgid ""
"[GNOME Universal access](https://help.gnome.org/users/gnome-help/stable/a11y."
"html) guide."
msgstr ""
-"همان‌طور که در راهنمای [دسترسی همگانی گنوم](https://help.gnome.org/users"
-"/gnome-help/stable/a11y.html.fa) آمده، دسکتاپ گنوم ویژگی‌های دسترسی‌پذیری "
+"همان‌طور که در راهنمای [دسترسی همگانی گنوم](https://help.gnome.org/users/"
+"gnome-help/stable/a11y.html.fa) آمده، دسکتاپ گنوم ویژگی‌های دسترسی‌پذیری "
"بسیاری ارائه می‌کند."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgid ""
"To access those utilities choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Settings</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgstr ""
"برای دسترسی به این ابزار\n"
@@ -114,8 +121,7 @@ msgstr ""
"<p>ابزار روخوانی صفحه <span class=\"application\">گنوم\n"
"اورکا</span> نه با نصب‌کننده تیلز<span class=\"application\">\n"
"کار می‌کند </span> و نه با <span class=\"application\">\n"
-"مرورگر غیرامن وب</span> و <span class=\"application\">مرورگر I2P</span>.</p>."
-"\n"
+"مرورگر غیرامن وب</span> و <span class=\"application\">مرورگر I2P</span>.</p>.\n"
#. type: Plain text
#, no-wrap
@@ -136,14 +142,12 @@ msgid ""
msgstr ""
"اگر **ترجیح می‌دهید از یک ابزار اشاره‌ای به جای صفحه‌کلید استفاده کنید**\n"
"می‌توانید [[<span class=\"application\">فلورنس</span> virtual\n"
-"keyboard|first_steps/introduction_to_gnome_and_the_tails_desktop#florence]] "
-"را به کار ببندید.\n"
+"keyboard|first_steps/introduction_to_gnome_and_the_tails_desktop#florence]] را به کار ببندید.\n"
#. type: Title =
#, no-wrap
msgid "<span class=\"application\">Dasher</span> graphical text entry application\n"
-msgstr ""
-"ابزار گرافیکی وارد کردن متنِ <span class=\"application\">Dasher</span>\n"
+msgstr "ابزار گرافیکی وارد کردن متنِ <span class=\"application\">Dasher</span>\n"
#. type: Plain text
#, no-wrap
@@ -154,10 +158,8 @@ msgid ""
"entry application.\n"
msgstr ""
"اگر تنها **با یک دست** (با دستهٔ بازی یا صفحهٔ لمسی و یا\n"
-"موش‌واره) یا **بدون دست** (با موش‌واره سر یا ابزار ردیاب نگاه) از رایانه "
-"استفاده می‌کنید، می‌توانید\n"
-"ابزار گرافیکی پیش‌بینی متن را <span class=\"application\""
-">[Dasher](http://www.inference.phy.cam.ac.uk/dasher/)\n"
+"موش‌واره) یا **بدون دست** (با موش‌واره سر یا ابزار ردیاب نگاه) از رایانه استفاده می‌کنید، می‌توانید\n"
+"ابزار گرافیکی پیش‌بینی متن را <span class=\"application\">[Dasher](http://www.inference.phy.cam.ac.uk/dasher/)\n"
"</span> به کار ببندید.\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/accessibility.fr.po b/wiki/src/doc/first_steps/accessibility.fr.po
index b9756db..7cd0c94 100644
--- a/wiki/src/doc/first_steps/accessibility.fr.po
+++ b/wiki/src/doc/first_steps/accessibility.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-19 00:52+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,14 +37,21 @@ msgstr ""
"users/gnome-help/stable/a11y.html.fr)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgid ""
"To access those utilities choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Settings</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgstr ""
"Pour accéder à ces utilitaires, choississez\n"
diff --git a/wiki/src/doc/first_steps/accessibility.pt.po b/wiki/src/doc/first_steps/accessibility.pt.po
index 79df2a2..7d73e1e 100644
--- a/wiki/src/doc/first_steps/accessibility.pt.po
+++ b/wiki/src/doc/first_steps/accessibility.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-07-31 14:37-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,14 +36,21 @@ msgstr ""
"org/users/gnome-help/stable/a11y.html.pt_BR)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgid ""
"To access those utilities choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Settings</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Universal Access</span></span>.\n"
msgstr ""
"Para acessar estes utilitários, escolha\n"
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.de.po b/wiki/src/doc/first_steps/installation/manual/linux.de.po
index 9522988..b2c7693 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-09-20 20:57+0200\n"
+"POT-Creation-Date: 2016-02-02 16:24+0100\n"
"PO-Revision-Date: 2015-09-15 16:19+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails T10n <tails-l10n@boum.org>\n"
@@ -193,12 +193,20 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you are not sure about the path to the ISO image or if you get a\n"
+#| "<span class=\"guilabel\">No such\n"
+#| "file or directory</span> error message, you can first type\n"
+#| "<code>dd</code>, followed by a space, and\n"
+#| "then drag and drop the icon of the ISO image from a file browser onto the\n"
+#| "terminal. This should insert the correct path to the ISO image in the terminal.\n"
+#| "Then complete the command and execute it.\n"
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
"file or directory</span> error message, you can first type\n"
-"<code>dd</code>, followed by a space, and\n"
+"<span class=\"command\">dd if=</span>, and\n"
"then drag and drop the icon of the ISO image from a file browser onto the\n"
"terminal. This should insert the correct path to the ISO image in the terminal.\n"
"Then complete the command and execute it.\n"
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.fa.po b/wiki/src/doc/first_steps/installation/manual/linux.fa.po
index b7f55ab..890d3d0 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.fa.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.fa.po
@@ -6,11 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-07-28 09:53+0200\n"
+"POT-Creation-Date: 2016-02-02 16:24+0100\n"
"PO-Revision-Date: 2015-10-14 19:35+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian "
-"<http://weblate.451f.org:8889/projects/tails/linux/fa/>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/linux/fa/"
+">\n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,8 @@ msgstr "[[!meta title=\"نصب دستی با استفاده از لینوکس\"]
#. type: Plain text
#, fuzzy, no-wrap
-msgid ""
-"[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" "
-"raw=\"yes\"]]\n"
-msgstr ""
-"[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"بله\""
-"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"بله\"]]\n"
#. type: Plain text
msgid "This technique uses the command line."
@@ -48,9 +44,7 @@ msgstr "<a id=\"step_1\"></a>\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<h2 class=\"bullet-number-one\">Find out the device name of the "
-"device</h2>\n"
+msgid "<h2 class=\"bullet-number-one\">Find out the device name of the device</h2>\n"
msgstr "<h2 class=\"bullet-number-one\">نام دستگاه را پیدا کنید</h2>\n"
#. type: Plain text
@@ -69,14 +63,13 @@ msgid ""
"Make sure that the USB stick or SD card onto which you want to install Tails "
"is unplugged."
msgstr ""
-"مطمئن شوید که درایو یو‌اس‌بی یا کارت حافظه‌ای که می‌خواهید تیلز را روی آن "
-"نصب کنید، متصل نیست."
+"مطمئن شوید که درایو یو‌اس‌بی یا کارت حافظه‌ای که می‌خواهید تیلز را روی آن نصب "
+"کنید، متصل نیست."
#. type: Plain text
#, fuzzy, no-wrap
msgid ""
-" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the "
-"menu\n"
+" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
@@ -101,32 +94,25 @@ msgstr ""
#. type: Bullet: ' 1. '
msgid "Plug the USB stick or SD card onto which you want to install Tails."
msgstr ""
-"درایو یواس‌بی یا کارت حافظه‌ای که می‌خواهید تیلز را روی آن نصب کنید، متصل "
-"کنید."
+"درایو یواس‌بی یا کارت حافظه‌ای که می‌خواهید تیلز را روی آن نصب کنید، متصل کنید."
#. type: Plain text
#, no-wrap
msgid " A new device appears in the list of storage devices. Click on it.\n"
-msgstr ""
-" یک دستگاه جدید در فهرست دستگاه‌های ذخیرهٔ داده ظاهر می‌شود. روی آن کلیک "
-"کنید.\n"
+msgstr " یک دستگاه جدید در فهرست دستگاه‌های ذخیرهٔ داده ظاهر می‌شود. روی آن کلیک کنید.\n"
#. type: Bullet: ' 1. '
msgid ""
"In the right pane of the window, verify that the device corresponds to your "
"device, its brand, its size, etc."
msgstr ""
-"مطمئن شوید که این دستگاه، همان دستگاه مورد نظر شما است. در سمت چپ پنجره مارک،"
-" اندازهٔ آن و غیره را بررسی کنید."
+"مطمئن شوید که این دستگاه، همان دستگاه مورد نظر شما است. در سمت چپ پنجره "
+"مارک، اندازهٔ آن و غیره را بررسی کنید."
#. type: Plain text
#, no-wrap
-msgid ""
-" [[!img destination_device_description.png link=no alt=\"Drive "
-"description containing: 'Device: /dev/sdc'\"]]\n"
-msgstr ""
-" [[!img destination_device_description.png link=no alt=\"مشخصات درایو "
-"شامل 'Device: /dev/sdc'\"]]\n"
+msgid " [[!img destination_device_description.png link=no alt=\"Drive description containing: 'Device: /dev/sdc'\"]]\n"
+msgstr " [[!img destination_device_description.png link=no alt=\"مشخصات درایو شامل 'Device: /dev/sdc'\"]]\n"
#. type: Plain text
#, no-wrap
@@ -149,8 +135,7 @@ msgid ""
"proceeding or <strong>you risk overwriting any hard disk on the\n"
"system</strong>.\n"
msgstr ""
-"اگر درباره نام ابزار خود مطمئن نیستید، نباید از فرمان زیر استفاده کنید. در "
-"غیر این صورت <strong>ممکن است \n"
+"اگر درباره نام ابزار خود مطمئن نیستید، نباید از فرمان زیر استفاده کنید. در غیر این صورت <strong>ممکن است \n"
"سخت‌دیسک روی سیستم شما بازنویسی شود</strong>.\n"
#. type: Plain text
@@ -171,9 +156,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p><strong>All the data on the installed device will be lost.</strong></p>\n"
-msgstr ""
-"<p><strong>تمام داده‌های موجود روی ابزار نصب‌شده از دست خواهتد "
-"رفت.</strong></p>\n"
+msgstr "<p><strong>تمام داده‌های موجود روی ابزار نصب‌شده از دست خواهتد رفت.</strong></p>\n"
#. type: Plain text
msgid ""
@@ -181,8 +164,8 @@ msgid ""
"ISO image that you want to copy and `[device]` with the device name found in "
"step 1."
msgstr ""
-"این فرمان‌ها را برای جایگزینی `[tails.iso]` با مسیری که تصویر ISO که می‌"
-"خواهید کپی کنید `[device]` با نام ابزار که در مرحله اول دیدید، انجام دهید."
+"این فرمان‌ها را برای جایگزینی `[tails.iso]` با مسیری که تصویر ISO که می‌خواهید "
+"کپی کنید `[device]` با نام ابزار که در مرحله اول دیدید، انجام دهید."
#. type: Plain text
#, no-wrap
@@ -190,18 +173,15 @@ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
#. type: Plain text
-msgid "Here is an example of the commands to execute, yours are probably different:"
+msgid ""
+"Here is an example of the commands to execute, yours are probably different:"
msgstr ""
"این یک مثال از فرمان‌هایی برای اجرا است که ممکن است برای شما متفاوت باشد:"
#. type: Plain text
#, no-wrap
-msgid ""
-" dd if='/home/amnesia/Desktop/tails-0.6.2.iso' of=/dev/sdc bs=16M && "
-"sync\n"
-msgstr ""
-" dd if='/home/amnesia/Desktop/tails-0.6.2.iso' of=/dev/sdc bs=16M && "
-"sync\n"
+msgid " dd if='/home/amnesia/Desktop/tails-0.6.2.iso' of=/dev/sdc bs=16M && sync\n"
+msgstr " dd if='/home/amnesia/Desktop/tails-0.6.2.iso' of=/dev/sdc bs=16M && sync\n"
#. type: Plain text
#, no-wrap
@@ -209,27 +189,32 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you are not sure about the path to the ISO image or if you get a\n"
+#| "<span class=\"guilabel\">No such\n"
+#| "file or directory</span> error message, you can first type\n"
+#| "<code>dd</code>, followed by a space, and\n"
+#| "then drag and drop the icon of the ISO image from a file browser onto the\n"
+#| "terminal. This should insert the correct path to the ISO image in the terminal.\n"
+#| "Then complete the command and execute it.\n"
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
"file or directory</span> error message, you can first type\n"
-"<code>dd</code>, followed by a space, and\n"
+"<span class=\"command\">dd if=</span>, and\n"
"then drag and drop the icon of the ISO image from a file browser onto the\n"
-"terminal. This should insert the correct path to the ISO image in the "
-"terminal.\n"
+"terminal. This should insert the correct path to the ISO image in the terminal.\n"
"Then complete the command and execute it.\n"
msgstr ""
-"اگر درباره مسیر تصویر ISO مطمئن نیستید یا پیغام <span class=\"guilabel\">"
-"چنین فایل یا پوشه‌ای پیدا نشد</span>\n"
-"دریافت می‌کنید، می‌توانید در ترمینال این فرمان را تایپ کنید <code>dd</code> "
-"و بعد از یک فاصله، نمایهٔ تصویر ایزو را \n"
+"اگر درباره مسیر تصویر ISO مطمئن نیستید یا پیغام <span class=\"guilabel\">چنین فایل یا پوشه‌ای پیدا نشد</span>\n"
+"دریافت می‌کنید، می‌توانید در ترمینال این فرمان را تایپ کنید <code>dd</code> و بعد از یک فاصله، نمایهٔ تصویر ایزو را \n"
"بکشید و در ترمینال رها کنید. سبپس فرمان را تمام و اجرا کنید.\n"
#. type: Plain text
msgid ""
-"If you don't see any error message, Tails is being copied onto the "
-"device. The whole process might take some time, generally a few minutes."
+"If you don't see any error message, Tails is being copied onto the device. "
+"The whole process might take some time, generally a few minutes."
msgstr ""
"اگر پیغام خطا را نمی‌بینید، تیلز در حال کپی شدن روی دستگاه است. این فرآیند "
"ممکن است مدتی طول بکشد که این زمان معمولاً چند دقیقه است."
@@ -260,8 +245,8 @@ msgstr "dd: /dev/sdx: این فایل یا پوشه وجود ندارد"
#. type: Plain text
msgid ""
-"Then double-check the name of the device you found in [[step "
-"1|linux#step_1]]."
+"Then double-check the name of the device you found in [[step 1|"
+"linux#step_1]]."
msgstr "نام وسیله‌ای را که در [[مرحلهٔ ۱|linux#step_1]] یافتید دوباره چک کنید."
#. type: Title ###
@@ -271,15 +256,15 @@ msgstr "dd: /dev/sdx: اجازه داده نشد"
#. type: Plain text
msgid ""
-"You might also have committed a mistake in the device name, so please "
-"double-check it. If you are sure about the device name, this could be a "
-"permission problem and you could need to gain administration privileges "
-"before running the commands in the terminal. That could be:"
+"You might also have committed a mistake in the device name, so please double-"
+"check it. If you are sure about the device name, this could be a permission "
+"problem and you could need to gain administration privileges before running "
+"the commands in the terminal. That could be:"
msgstr ""
"ممکن در بررسی نام دستگاه اشتباهی انجام داده باشید. لطفاً دوباره آن را چک "
"کنید. اگر از نام دستگاه مطمئن هستید ممکن است این مشکل اجازه باشد و پیش از "
-"این که فرمان‌هایی را در ترمینال اجرا کنید، نیاز به اجازه مدیریت داشته "
-"باشید. برای نمونه:‌"
+"این که فرمان‌هایی را در ترمینال اجرا کنید، نیاز به اجازه مدیریت داشته باشید. "
+"برای نمونه:‌"
#. type: Plain text
#, no-wrap
@@ -296,5 +281,4 @@ msgid ""
"Then you surely have committed a mistake on the path to the ISO image in "
"[[step 2|linux#step_2]]."
msgstr ""
-"بنابراین مطمئناً در مسیر فایل ایزو [[مرحلهٔ ۲|linux#step_2]] اشتباهی "
-"کرده‌اید."
+"بنابراین مطمئناً در مسیر فایل ایزو [[مرحلهٔ ۲|linux#step_2]] اشتباهی کرده‌اید."
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.fr.po b/wiki/src/doc/first_steps/installation/manual/linux.fr.po
index 436df4f..02af611 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSIONx\n"
-"POT-Creation-Date: 2015-04-04 12:16+0200\n"
+"POT-Creation-Date: 2016-02-02 16:24+0100\n"
"PO-Revision-Date: 2015-04-04 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: GANGUALE <LL@li.org>\n"
@@ -193,12 +193,20 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you are not sure about the path to the ISO image or if you get a\n"
+#| "<span class=\"guilabel\">No such\n"
+#| "file or directory</span> error message, you can first type\n"
+#| "<code>dd</code>, followed by a space, and\n"
+#| "then drag and drop the icon of the ISO image from a file browser onto the\n"
+#| "terminal. This should insert the correct path to the ISO image in the terminal.\n"
+#| "Then complete the command and execute it.\n"
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
"file or directory</span> error message, you can first type\n"
-"<code>dd</code>, followed by a space, and\n"
+"<span class=\"command\">dd if=</span>, and\n"
"then drag and drop the icon of the ISO image from a file browser onto the\n"
"terminal. This should insert the correct path to the ISO image in the terminal.\n"
"Then complete the command and execute it.\n"
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.mdwn b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
index 52ddb1c..13d83de 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
@@ -73,7 +73,7 @@ Here is an example of the commands to execute, yours are probably different:
If you are not sure about the path to the ISO image or if you get a
<span class="guilabel">No such
file or directory</span> error message, you can first type
-<code>dd</code>, followed by a space, and
+<span class="command">dd if=</span>, and
then drag and drop the icon of the ISO image from a file browser onto the
terminal. This should insert the correct path to the ISO image in the terminal.
Then complete the command and execute it.
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.pt.po b/wiki/src/doc/first_steps/installation/manual/linux.pt.po
index 3c97f5a..5a103b6 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-04 12:16+0200\n"
+"POT-Creation-Date: 2016-02-02 16:24+0100\n"
"PO-Revision-Date: 2015-04-04 12:20+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -191,12 +191,20 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you are not sure about the path to the ISO image or if you get a\n"
+#| "<span class=\"guilabel\">No such\n"
+#| "file or directory</span> error message, you can first type\n"
+#| "<code>dd</code>, followed by a space, and\n"
+#| "then drag and drop the icon of the ISO image from a file browser onto the\n"
+#| "terminal. This should insert the correct path to the ISO image in the terminal.\n"
+#| "Then complete the command and execute it.\n"
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
"file or directory</span> error message, you can first type\n"
-"<code>dd</code>, followed by a space, and\n"
+"<span class=\"command\">dd if=</span>, and\n"
"then drag and drop the icon of the ISO image from a file browser onto the\n"
"terminal. This should insert the correct path to the ISO image in the terminal.\n"
"Then complete the command and execute it.\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index 31fa3d1..59aad7d 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-11 10:58+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -22,24 +22,22 @@ msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
msgstr "[[!meta title=\"Einführung in GNOME und den Tails Desktop\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
+#| "version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-"
+#| "help/3.4/fallback-mode.html.en)."
msgid ""
"The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
-"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
-"fallback-mode.html.en)."
+"more precisely [GNOME Classic](https://help.gnome.org/users/gnome-help/"
+"stable/gnome-classic.html) version 3.14. This page describes some important "
+"features of the desktop in the context of Tails."
msgstr ""
"Tails verwendet als Desktopumgebung [GNOME](https://www.gnome.org) in "
"Version 3.4 im [Ausweichmodus](https://help.gnome.org/users/gnome-help/3.4/"
"fallback-mode.html.de)."
#. type: Plain text
-msgid ""
-"This page describes some important features of the desktop in the context of "
-"Tails."
-msgstr ""
-"Diese Seite beschreibt einige wichtige Funktionen des Desktops im Bezug auf "
-"Tails."
-
-#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -61,6 +59,12 @@ msgstr "das <span class=\"guimenu\">Anwendungen</span>-Menü"
msgid "the <span class=\"guimenu\">Places</span> menu"
msgstr "das <span class=\"guimenu\">Orte</span>-Menü"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"applications\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
@@ -96,12 +100,20 @@ msgid "[[!img help-browser.png link=no]]\n"
msgstr "[[!img help-browser.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Help</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"guimenuitem\">Help</span>: to access the <span class=\"application\">GNOME Desktop Help</span> choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Help</span></span>\n"
" </div>\n"
"</div>\n"
@@ -114,52 +126,24 @@ msgstr ""
" </div>\n"
"</div>\n"
-#. type: Title ###
-#, no-wrap
-msgid "System Tools submenu"
-msgstr "Systemwerkzeuge-Untermenü"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
-"the GNOME desktop or the system.\n"
-msgstr ""
-"Das <span class=\"guisubmenu\">Systemwerkzeuge</span>-Untermenü erlaubt es Ihnen,\n"
-"den GNOME-Desktop oder das System anzupassen.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"next\">\n"
-msgstr "<div class=\"next\">\n"
-
-#. type: Plain text
-msgid ""
-"By default, any such customization is reset when shutting down Tails. Read "
-"the documentation on [[persistence|persistence]] to learn which "
-"configuration can be made persistent across separate working sessions."
-msgstr ""
-"Standardmäßig werden alle diese Konfigurationen beim Herunterfahren von "
-"Tails zurückgesetzt. Lesen Sie die Dokumentation zum [[beständigen "
-"Speicherbereich|persistence]], um zu erfahren, welche Konfigurationen über "
-"mehrere Arbeitssitzungen hinweg dauerhaft gesichert werden können."
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid "Among other utilities, it includes:"
-msgstr "Zusammen mit anderen Werkzeugen enthält es:"
-
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr "[[!img preferences-system.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">System Settings</span>:\n"
+#| " to change various system settings such as keyboard, mouse and touchpad,\n"
+#| " or displays choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">System Settings</span>:\n"
@@ -167,8 +151,7 @@ msgid ""
" or displays choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span></span>\n"
+" <span class=\"guimenuitem\">Settings</span></span>\n"
" </div>\n"
"</div>\n"
msgstr ""
@@ -184,19 +167,64 @@ msgstr ""
"</div>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"icon\">\n"
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To learn about the many keyboard shortcuts in GNOME, click on\n"
+"<span class=\"guilabel\">Keyboard</span> from the <span class=\"guilabel\">System\n"
+"Settings</span> and open the <span class=\"guilabel\">Shortcuts</span>\n"
+"tab.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"next\">\n"
+msgstr "<div class=\"next\">\n"
+
+#. type: Plain text
+msgid ""
+"By default, any such customization is reset when shutting down Tails. Read "
+"the documentation on [[persistence|persistence]] to learn which "
+"configuration can be made persistent across separate working sessions."
+msgstr ""
+"Standardmäßig werden alle diese Konfigurationen beim Herunterfahren von "
+"Tails zurückgesetzt. Lesen Sie die Dokumentation zum [[beständigen "
+"Speicherbereich|persistence]], um zu erfahren, welche Konfigurationen über "
+"mehrere Arbeitssitzungen hinweg dauerhaft gesichert werden können."
+
+#. type: Plain text
#, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
msgstr "[[!img seahorse.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Seahorse</span>:\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">Seahorse</span>:\n"
" to manage your OpenPGP keys choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
" </div>\n"
"</div>\n"
@@ -212,82 +240,23 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img synaptic.png link=no]]\n"
-msgstr "[[!img synaptic.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
-" to install, remove, and upgrade software packages choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
-" </div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span>:\n"
-" um Softwarepakete zu installieren, entfernen oder zu aktualisieren, wählen Sie\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Systemwerkzeuge</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Systemverwaltung</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span></span>\n"
-" </div>\n"
-"</div>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Places menu\n"
-msgstr "Orte-Menü\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
-"storage media.\n"
-msgstr ""
-"Das <span class=\"guimenu\">Orte</span>-Menü bietet Ihnen direkten Zugang zu verschiedenen\n"
-"Speichermedien.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To connect to a remote FTP or SFTP server choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
-msgstr ""
-"Um sich mit einem FTP oder SFTP Server zu verbinden, wählen Sie\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Orte</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Verbindung zu Server…</span></span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"app_shortcuts\"></a>\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"favorites\"></a>\n"
msgstr "<a id=\"app_shortcuts\"></a>\n"
-#. type: Title -
+#. type: Title ###
#, no-wrap
-msgid "Applications shortcuts\n"
-msgstr "Anwendungsverknüpfungen\n"
+msgid "Favorites submenu"
+msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "On the right of these two menu entries, a few shortcuts allow to launch the most frequently used applications."
msgid ""
-"On the right of these two menu entries, a few shortcuts allow to launch the "
-"most frequently used applications."
-msgstr ""
-"Auf der rechten Seite dieser beiden Menüeinträge ermöglichen Ihnen ein paar "
-"Verknüpfungen, die am meisten verwendeten Anwendungen zu starten."
+"In the <span class=\"guisubmenu\">Favorites</span> submenu, a few\n"
+"shortcuts allow you to launch the most frequently used applications:\n"
+msgstr "Auf der rechten Seite dieser beiden Menüeinträge ermöglichen Ihnen ein paar Verknüpfungen, die am meisten verwendeten Anwendungen zu starten."
#. type: Plain text
#, no-wrap
@@ -398,45 +367,56 @@ msgstr ""
"<div class=\"text\"><strong>GNOME Terminal</strong>: Verwenden Sie die Befehlszeile</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"places\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
#. type: Title -
#, no-wrap
-msgid "Notification area\n"
-msgstr "Benachrichtigungsbereich\n"
+msgid "Places menu\n"
+msgstr "Orte-Menü\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+#| "storage media.\n"
msgid ""
-"In the upper right corner you will find a couple of icons, each of which "
-"offers an interface for some system feature or running application. You are "
-"encouraged to check these icons out with the left and right mouse buttons."
+"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+"folders and storage media.\n"
msgstr ""
-"In der rechten oberen Ecke werden Sie einige Symbole finden, von denen jedes "
-"eine Bedienoberfläche für einige Systemfunktionen oder laufende Programme "
-"bietet. Wir ermutigen Sie, diese Symbole mit der linken und rechten "
-"Maustaste zu erkunden."
+"Das <span class=\"guimenu\">Orte</span>-Menü bietet Ihnen direkten Zugang zu verschiedenen\n"
+"Speichermedien.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img tor-on.png link=no]]\n"
-msgstr "[[!img tor-on.png link=no]]\n"
+msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-starting.png link=no]]\n"
-msgstr "[[!img tor-starting.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"vidalia\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img tor-off.png link=no]]\n"
-msgstr "[[!img tor-off.png link=no]]\n"
+msgid "Tor controller\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
+#| "[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
+#| "</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\">\n"
-"<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
-"</div>\n"
-"</div>\n"
+"<span class=\"application\">Vidalia</span> is a graphical controller for\n"
+"Tor. [[See the corresponding documentation.|anonymous_internet/vidalia]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Vidalia</strong>: Grafische Steuerung für Tor<br/>\n"
@@ -445,27 +425,36 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img vidalia.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img florence.png link=no]]\n"
-msgstr "[[!img florence.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"florence\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Florence</strong>: virtual keyboard<br/>\n"
-"[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
-"</div>\n"
-"</div>\n"
+"Virtual keyboard\n"
+"-----------------\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Florence</strong>: virtual keyboard<br/>\n"
+#| "[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
+#| "</div>\n"
+#| "</div>\n"
+msgid ""
+"The <span class=\"application\">Florence</span> virtual keyboard can\n"
+"protect you against a hardware keylogger when typing passwords and sensitive text.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/virtual_keyboard]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Florence</strong>: Bildschirmstastatur<br/>\n"
@@ -474,27 +463,33 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr "[[!img gpgApplet-text.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img florence.png link=no]]\n"
+msgid "[[!img florence.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr "[[!img gpgApplet.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"openpgp\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+msgid "OpenPGP applet\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
+#| "clipboard using OpenPGP<br/> [[See the corresponding\n"
+#| "documentation|encryption_and_privacy/gpgapplet]]</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
-"clipboard using OpenPGP<br/> [[See the corresponding\n"
-"documentation|encryption_and_privacy/gpgapplet]]</div>\n"
-"</div>\n"
+"Using the <span class=\"application\">Tails OpenPGP Applet</span> you can\n"
+"encrypt and decrypt the clipboard using OpenPGP.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/gpgapplet]]\n"
msgstr ""
"<div class=\"text\"><strong>Tails OpenPGP-Applet</strong>: Verschlüsseln und entschlüsseln\n"
"Sie die Zwischenablage mit OpenPGP<br/> [[Lesen Sie die entsprechende\n"
@@ -502,158 +497,122 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img openpgp_applet.png link=no alt=\"Tails OpenPGP Applet\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"accessibility\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid "[[!img sound.png link=no]]\n"
-msgstr "[[!img sound.png link=no]]\n"
+msgid "Accessibility tools\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
-"volume</div>\n"
-"</div>\n"
+"The accessibility tools allow you to activate the screen reader, large text "
+"display, and other accessibility features."
msgstr ""
-"<div class=\"text\"><strong>Tonlautstärke</strong>: Steuern Sie die\n"
-"Lautstärke vom Ton</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img power.png link=no]]\n"
-msgstr "[[!img power.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img accessibility.png link=no alt=\"Accessibility tools\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"keyboard\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong>: information about your battery, if you are using\n"
-"a laptop<br/>\n"
-"</div>\n"
-"</div>\n"
+msgid "Keyboard layouts\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Energie-Manager</strong>: Informationen über Ihren Akku, wenn Sie einen Laptop\n"
-"benutzen<br/>\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
+"The keyboard layout menu allow you to change the keyboard layout and input "
+"method for non-Latin scripts."
msgstr ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-en.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img keyboard-en.png link=no]]\n"
+msgid "[[!img keyboard.png link=no alt=\"Keyboard layouts\"]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr "[[!img keyboard-de.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"system\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "System Tools submenu"
+msgid "System menu\n"
+msgstr "Systemwerkzeuge-Untermenü"
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
-"Right-click to configure a different keyboard layout.</div>\n"
-"</div>\n"
+"In the top-right corner of the top bar, the system menu allows you to manage "
+"your systems settings and your computer."
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Tastaturlayout</strong>: Aktuelles Tastaturlayout<br/>\n"
-"Rechtsklicken Sie, um ein anderes Tastaturlayout einzustellen.</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-idle.png link=no]]\n"
-msgstr "[[!img network-idle.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-wired.png link=no]]\n"
-msgstr "[[!img network-wired.png link=no]]\n"
+msgid "<p>See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].</p>\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-wireless.png link=no]]\n"
-msgstr "[[!img network-wireless.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"nautilus\"></a>\n"
+msgid "<a id=\"activities\"></a>\n"
+msgstr "<a id=\"nautilus\"></a>\n"
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong>: handle your wireless or cabled network\n"
-"connection<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
+msgid "Activities overview\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Netzwerk-Manager</strong>: Verwalten Sie Ihre drahtlosen oder kabelgebundenen\n"
-"Netzwerkverbindungen<br/>\n"
-"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
+msgid "To access your windows and applications you can either:"
msgstr ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img shutdown.png link=no]]\n"
-msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
-"system</div>\n"
-"</div>\n"
+" - Choose <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Activities Overview</span></span>.\n"
+" - Throw your mouse pointer to the top-left hot corner.\n"
+" - Press the windows key on your keyboard.\n"
msgstr ""
-"<div class=\"text\"><strong>System herunterfahren</strong>: Fahren Sie das System herunter oder starten Sie es\n"
-"neu</div>\n"
-"</div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Bottom panel\n"
-msgstr "Fußleiste\n"
#. type: Plain text
-msgid "On the left of the bottom panel are displayed buttons for open windows."
+msgid ""
+"You can see your windows and applications in the overview. You can also "
+"start typing to search your applications, files, and folders."
msgstr ""
-"Im linken Bereich der Fußleiste werden Schaltflächen für geöffnete Fenster "
-"angezeigt."
#. type: Plain text
-msgid ""
-"On the right of the bottom panel, a set of four similar rectangle icons "
-"gives access to four different workspaces."
-msgstr ""
-"Im rechten Bereich der Fußleiste sehen Sie eine Anordnung vier gleicher, "
-"rechteckiger Symbole, die Zugriff zu vier verschiedenen Arbeitsbereichen "
-"bieten."
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"shortcuts\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
#. type: Title =
#, no-wrap
@@ -662,20 +621,6 @@ msgstr "Desktopverknüpfungen\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img computer.png link=no]]\n"
-msgstr "[[!img computer.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\"><strong>Computer</strong>: Greifen Sie auf Speichermedien zu</div>\n"
-"</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
msgstr "[[!img user-home.png link=no]]\n"
@@ -771,6 +716,231 @@ msgstr ""
"Dateien oder Ordner zu verschieben, können Sie sie aus einem Fenster in das "
"nächste ziehen und loslassen."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To connect to a remote FTP or SFTP server choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
+msgid ""
+"To connect to a remote FTP or SFTP server choose\n"
+"<span class=\"guilabel\">Connect to Server</span></span>.\n"
+msgstr ""
+"Um sich mit einem FTP oder SFTP Server zu verbinden, wählen Sie\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Orte</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Verbindung zu Server…</span></span>\n"
+
+#~ msgid ""
+#~ "This page describes some important features of the desktop in the context "
+#~ "of Tails."
+#~ msgstr ""
+#~ "Diese Seite beschreibt einige wichtige Funktionen des Desktops im Bezug "
+#~ "auf Tails."
+
+#~ msgid ""
+#~ "The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
+#~ "the GNOME desktop or the system.\n"
+#~ msgstr ""
+#~ "Das <span class=\"guisubmenu\">Systemwerkzeuge</span>-Untermenü erlaubt es Ihnen,\n"
+#~ "den GNOME-Desktop oder das System anzupassen.\n"
+
+#~ msgid "Among other utilities, it includes:"
+#~ msgstr "Zusammen mit anderen Werkzeugen enthält es:"
+
+#~ msgid "[[!img synaptic.png link=no]]\n"
+#~ msgstr "[[!img synaptic.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
+#~ " to install, remove, and upgrade software packages choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span>:\n"
+#~ " um Softwarepakete zu installieren, entfernen oder zu aktualisieren, wählen Sie\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">Systemwerkzeuge</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Systemverwaltung</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+
+#~ msgid "Applications shortcuts\n"
+#~ msgstr "Anwendungsverknüpfungen\n"
+
+#~ msgid "Notification area\n"
+#~ msgstr "Benachrichtigungsbereich\n"
+
+#~ msgid ""
+#~ "In the upper right corner you will find a couple of icons, each of which "
+#~ "offers an interface for some system feature or running application. You "
+#~ "are encouraged to check these icons out with the left and right mouse "
+#~ "buttons."
+#~ msgstr ""
+#~ "In der rechten oberen Ecke werden Sie einige Symbole finden, von denen "
+#~ "jedes eine Bedienoberfläche für einige Systemfunktionen oder laufende "
+#~ "Programme bietet. Wir ermutigen Sie, diese Symbole mit der linken und "
+#~ "rechten Maustaste zu erkunden."
+
+#~ msgid "[[!img tor-on.png link=no]]\n"
+#~ msgstr "[[!img tor-on.png link=no]]\n"
+
+#~ msgid "[[!img tor-starting.png link=no]]\n"
+#~ msgstr "[[!img tor-starting.png link=no]]\n"
+
+#~ msgid "[[!img tor-off.png link=no]]\n"
+#~ msgstr "[[!img tor-off.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img gpgApplet-text.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-text.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet-seal.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img sound.png link=no]]\n"
+#~ msgstr "[[!img sound.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
+#~ "volume</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Tonlautstärke</strong>: Steuern Sie die\n"
+#~ "Lautstärke vom Ton</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img power.png link=no]]\n"
+#~ msgstr "[[!img power.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong>: information about your battery, if you are using\n"
+#~ "a laptop<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Energie-Manager</strong>: Informationen über Ihren Akku, wenn Sie einen Laptop\n"
+#~ "benutzen<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img keyboard-de.png link=no]]\n"
+#~ msgstr "[[!img keyboard-de.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
+#~ "Right-click to configure a different keyboard layout.</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Tastaturlayout</strong>: Aktuelles Tastaturlayout<br/>\n"
+#~ "Rechtsklicken Sie, um ein anderes Tastaturlayout einzustellen.</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img network-idle.png link=no]]\n"
+#~ msgstr "[[!img network-idle.png link=no]]\n"
+
+#~ msgid "[[!img network-wired.png link=no]]\n"
+#~ msgstr "[[!img network-wired.png link=no]]\n"
+
+#~ msgid "[[!img network-wireless.png link=no]]\n"
+#~ msgstr "[[!img network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong>: handle your wireless or cabled network\n"
+#~ "connection<br/>\n"
+#~ "[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Netzwerk-Manager</strong>: Verwalten Sie Ihre drahtlosen oder kabelgebundenen\n"
+#~ "Netzwerkverbindungen<br/>\n"
+#~ "[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img shutdown.png link=no]]\n"
+#~ msgstr "[[!img shutdown.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
+#~ "system</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>System herunterfahren</strong>: Fahren Sie das System herunter oder starten Sie es\n"
+#~ "neu</div>\n"
+#~ "</div>\n"
+
+#~ msgid "Bottom panel\n"
+#~ msgstr "Fußleiste\n"
+
+#~ msgid ""
+#~ "On the left of the bottom panel are displayed buttons for open windows."
+#~ msgstr ""
+#~ "Im linken Bereich der Fußleiste werden Schaltflächen für geöffnete "
+#~ "Fenster angezeigt."
+
+#~ msgid ""
+#~ "On the right of the bottom panel, a set of four similar rectangle icons "
+#~ "gives access to four different workspaces."
+#~ msgstr ""
+#~ "Im rechten Bereich der Fußleiste sehen Sie eine Anordnung vier gleicher, "
+#~ "rechteckiger Symbole, die Zugriff zu vier verschiedenen Arbeitsbereichen "
+#~ "bieten."
+
+#~ msgid "[[!img computer.png link=no]]\n"
+#~ msgstr "[[!img computer.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Computer</strong>: Greifen Sie auf Speichermedien zu</div>\n"
+#~ "</div>\n"
+
#~ msgid "<a id=\"claws_mail\"></a>\n"
#~ msgstr "<a id=\"claws_mail\"></a>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
index 724ee9e..e07842b 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-15 07:22+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -25,22 +25,22 @@ msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
msgstr "[[!meta title=\"مقدمه‌ای بر گنوم و دسکتاپ تیلز\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
+#| "version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-"
+#| "help/3.4/fallback-mode.html.en)."
msgid ""
"The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
-"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
-"fallback-mode.html.en)."
+"more precisely [GNOME Classic](https://help.gnome.org/users/gnome-help/"
+"stable/gnome-classic.html) version 3.14. This page describes some important "
+"features of the desktop in the context of Tails."
msgstr ""
"محیط دسکتاپ مورد استفادهٔ تیلز [گنوم](https://www.gnome.org) نسخه ۳٫۴ در "
"[حالت فال‌بک](https://help.gnome.org/users/gnome-help/3.4/fallback-mode.html."
"fa) است."
#. type: Plain text
-msgid ""
-"This page describes some important features of the desktop in the context of "
-"Tails."
-msgstr "این صفحه درباره بخشی از ویژگی‌های مهم دسکتاپ در تیلز است."
-
-#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -63,6 +63,12 @@ msgstr "فهرست <span class=\"guimenu\">ابزارها</span>"
msgid "the <span class=\"guimenu\">Places</span> menu"
msgstr "فهرست <span class=\"guimenu\">Places</span>"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"applications\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
@@ -101,9 +107,9 @@ msgstr "[[!img help-browser.png link=no]]\n"
#, fuzzy, no-wrap
msgid ""
"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"guimenuitem\">Help</span>: to access the <span class=\"application\">GNOME Desktop Help</span> choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Help</span></span>\n"
" </div>\n"
"</div>\n"
@@ -116,44 +122,6 @@ msgstr ""
" </div>\n"
"</div>\n"
-#. type: Title ###
-#, no-wrap
-msgid "System Tools submenu"
-msgstr "زیرفهرست ابزارهای سیستم"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
-"the GNOME desktop or the system.\n"
-msgstr ""
-"زیرفهرست <span class=\"guisubmenu\">ابزارهای سیستم</span> submenu به شما اجازه می‌دهد\n"
-"دسکتاپ گنوم یا سیستم را مختص خودتان طراحی کنید.\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-msgid "<div class=\"next\">\n"
-msgstr "<div class=\"بعدی\">\n"
-
-#. type: Plain text
-msgid ""
-"By default, any such customization is reset when shutting down Tails. Read "
-"the documentation on [[persistence|persistence]] to learn which "
-"configuration can be made persistent across separate working sessions."
-msgstr ""
-"به‌طور پیش‌فرض، هر یک از این شخصی‌سازی‌ها با هر بار خاموش کردن تیلز از دست "
-"می‌رود. می‌توانید اسناد مربوط به [[مانا|persistence]] را\n"
-" بخوانید تا مطمئن شوید کدام تنظیمات پس از نشست‌های کاری باقی می‌مانند."
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid "Among other utilities, it includes:"
-msgstr "سایر کارکردهای کمکی شامل موارد زیر می‌شود:‌"
-
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
@@ -168,8 +136,7 @@ msgid ""
" or displays choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span></span>\n"
+" <span class=\"guimenuitem\">Settings</span></span>\n"
" </div>\n"
"</div>\n"
msgstr ""
@@ -184,6 +151,41 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
+#| msgid "<div class=\"icon\">\n"
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To learn about the many keyboard shortcuts in GNOME, click on\n"
+"<span class=\"guilabel\">Keyboard</span> from the <span class=\"guilabel\">System\n"
+"Settings</span> and open the <span class=\"guilabel\">Shortcuts</span>\n"
+"tab.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+msgid "<div class=\"next\">\n"
+msgstr "<div class=\"بعدی\">\n"
+
+#. type: Plain text
+msgid ""
+"By default, any such customization is reset when shutting down Tails. Read "
+"the documentation on [[persistence|persistence]] to learn which "
+"configuration can be made persistent across separate working sessions."
+msgstr ""
+"به‌طور پیش‌فرض، هر یک از این شخصی‌سازی‌ها با هر بار خاموش کردن تیلز از دست "
+"می‌رود. می‌توانید اسناد مربوط به [[مانا|persistence]] را\n"
+" بخوانید تا مطمئن شوید کدام تنظیمات پس از نشست‌های کاری باقی می‌مانند."
+
+#. type: Plain text
+#, fuzzy, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
msgstr "[[!img seahorse.png link=خیر]]\n"
@@ -194,8 +196,7 @@ msgid ""
" <span class=\"guimenuitem\">Seahorse</span>:\n"
" to manage your OpenPGP keys choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
" </div>\n"
"</div>\n"
@@ -212,79 +213,22 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
-msgid "[[!img synaptic.png link=no]]\n"
-msgstr "[[!img synaptic.png link=خیر]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
-" to install, remove, and upgrade software packages choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
-" </div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
-"برای نصب کردن، حذف و به‌روزرسانی یک بسته به این قسمت بروید:\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">ابزار سیستم</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">مدیریت</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
-" </div>\n"
-"</div>\n"
-
-#. type: Title -
-#, fuzzy, no-wrap
-msgid "Places menu\n"
-msgstr "Places فهرست\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-msgid ""
-"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
-"storage media.\n"
-msgstr "فهرست <span class=\"guimenu\">Places</span> امکان دسترسی مستقیم به دستگاه‌های ذخیره را فراهم می‌کند.\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-msgid ""
-"To connect to a remote FTP or SFTP server choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
-msgstr ""
-"برای اتصال به سرور FTP یا SFTP بروید به\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">اتصال به سرور </span></span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"app_shortcuts\"></a>\n"
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"favorites\"></a>\n"
msgstr "<a id=\"app_shortcuts\"></a>\n"
-#. type: Title -
+#. type: Title ###
#, no-wrap
-msgid "Applications shortcuts\n"
-msgstr "میان‌بر به ابزارها\n"
+msgid "Favorites submenu"
+msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "On the right of these two menu entries, a few shortcuts allow to launch the most frequently used applications."
msgid ""
-"On the right of these two menu entries, a few shortcuts allow to launch the "
-"most frequently used applications."
-msgstr ""
-"در سمت چپ این دو فهرست، تعدادی میان‌بر به ابزارهای متداول مورد استفاده وجود "
-"دارند."
+"In the <span class=\"guisubmenu\">Favorites</span> submenu, a few\n"
+"shortcuts allow you to launch the most frequently used applications:\n"
+msgstr "در سمت چپ این دو فهرست، تعدادی میان‌بر به ابزارهای متداول مورد استفاده وجود دارند."
#. type: Plain text
#, no-wrap
@@ -395,44 +339,51 @@ msgstr ""
"<div class=\"text\"><strong>پایانهٔ گنوم</strong>: برای استفاده از خط فرمان</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"places\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
#. type: Title -
-#, no-wrap
-msgid "Notification area\n"
-msgstr "محل آگهی\n"
+#, fuzzy, no-wrap
+msgid "Places menu\n"
+msgstr "Places فهرست\n"
#. type: Plain text
+#, fuzzy, no-wrap
msgid ""
-"In the upper right corner you will find a couple of icons, each of which "
-"offers an interface for some system feature or running application. You are "
-"encouraged to check these icons out with the left and right mouse buttons."
-msgstr ""
-"گوشه سمت چپ بالا، دو نمایه می‌بینید که هرکدام واسطی برای ابزارهای در حال "
-"استفاده و ویژگی‌های ابزارها ارائه می‌دهند. می‌توانید این نمایه‌ها را نگاه کنید و "
-"کاربرد آنها را با کلیدهای چپ و راست موش‌واره امتحان کنید."
+"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+"folders and storage media.\n"
+msgstr "فهرست <span class=\"guimenu\">Places</span> امکان دسترسی مستقیم به دستگاه‌های ذخیره را فراهم می‌کند.\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-on.png link=no]]\n"
-msgstr "[[!img tor-on.png link=no]]\n"
+#, fuzzy, no-wrap
+msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-starting.png link=no]]\n"
-msgstr "[[!img tor-starting.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"vidalia\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img tor-off.png link=no]]\n"
-msgstr "[[!img tor-off.png link=no]]\n"
+msgid "Tor controller\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
+#| "[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
+#| "</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\">\n"
-"<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
-"</div>\n"
-"</div>\n"
+"<span class=\"application\">Vidalia</span> is a graphical controller for\n"
+"Tor. [[See the corresponding documentation.|anonymous_internet/vidalia]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>ویدالیا</strong>: کنترل‌کنندهٔ گرافیکی «تور»<br/>\n"
@@ -441,27 +392,35 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+msgid "[[!img vidalia.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img florence.png link=no]]\n"
-msgstr "[[!img florence.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"florence\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Florence</strong>: virtual keyboard<br/>\n"
-"[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
-"</div>\n"
-"</div>\n"
+"Virtual keyboard\n"
+"-----------------\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Florence</strong>: virtual keyboard<br/>\n"
+#| "[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
+#| "</div>\n"
+#| "</div>\n"
+msgid ""
+"The <span class=\"application\">Florence</span> virtual keyboard can\n"
+"protect you against a hardware keylogger when typing passwords and sensitive text.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/virtual_keyboard]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>فلورhنس</strong>: صفحه کلید مجازی<br/>\n"
@@ -470,182 +429,152 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr "[[!img gpgApplet-text.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img florence.png link=no]]\n"
+msgid "[[!img florence.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr "[[!img gpgApplet.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"openpgp\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+msgid "OpenPGP applet\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
+#| "clipboard using OpenPGP<br/> [[See the corresponding\n"
+#| "documentation|encryption_and_privacy/gpgapplet]]</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
-"clipboard using OpenPGP<br/> [[See the corresponding\n"
-"documentation|encryption_and_privacy/gpgapplet]]</div>\n"
-"</div>\n"
+"Using the <span class=\"application\">Tails OpenPGP Applet</span> you can\n"
+"encrypt and decrypt the clipboard using OpenPGP.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/gpgapplet]]\n"
msgstr ""
"<div class=\"text\"><strong>برنامک اُپن‌پی‌جی‌پی تیلز</strong>: رمزگذاری و رمزگشایی \n"
"بریده‌دان با استفاده از اُپن‌پی‌جی‌پی<br/> [[اسناد مرتبط را ببینید|encryption_and_privacy/gpgapplet]]</div>\n"
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+msgid "[[!img openpgp_applet.png link=no alt=\"Tails OpenPGP Applet\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"accessibility\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid "[[!img sound.png link=no]]\n"
-msgstr "[[!img sound.png link=no]]\n"
+msgid "Accessibility tools\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
-"volume</div>\n"
-"</div>\n"
+"The accessibility tools allow you to activate the screen reader, large text "
+"display, and other accessibility features."
msgstr ""
-"<div class=\"text\"><strong>شدت صدا</strong>: کنترل شدت صدا\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img power.png link=no]]\n"
-msgstr "[[!img power.png link=no]]\n"
+#, fuzzy, no-wrap
+msgid "[[!img accessibility.png link=no alt=\"Accessibility tools\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"keyboard\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong>: information about your battery, if you are using\n"
-"a laptop<br/>\n"
-"</div>\n"
-"</div>\n"
+msgid "Keyboard layouts\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>ابزار مدیریت انرژی</strong>: اطلاعاتی درباره باتری، \n"
-"اگر از رایانه همراه ستفاده می‌کنید<br/>\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
+"The keyboard layout menu allow you to change the keyboard layout and input "
+"method for non-Latin scripts."
msgstr ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-en.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img keyboard-en.png link=no]]\n"
+msgid "[[!img keyboard.png link=no alt=\"Keyboard layouts\"]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr "[[!img keyboard-de.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"system\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "System Tools submenu"
+msgid "System menu\n"
+msgstr "زیرفهرست ابزارهای سیستم"
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
-"Right-click to configure a different keyboard layout.</div>\n"
-"</div>\n"
+"In the top-right corner of the top bar, the system menu allows you to manage "
+"your systems settings and your computer."
msgstr ""
-"<div class=\"text\">\n"
-"<strong>ظاهر صفحه‌کلید</strong>: ظاهر کنونی صفحه کلید<br/>\n"
-"برای پیکربندی یک ظاهر جدید صفحه‌کلید راست‌کلیک کنید.</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-idle.png link=no]]\n"
-msgstr "[[!img network-idle.png link=no]]\n"
+#, fuzzy, no-wrap
+msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Places menu\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-wired.png link=no]]\n"
-msgstr "[[!img network-wired.png link=no]]\n"
+msgid "<p>See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].</p>\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-wireless.png link=no]]\n"
-msgstr "[[!img network-wireless.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"nautilus\"></a>\n"
+msgid "<a id=\"activities\"></a>\n"
+msgstr "<a id=\"nautilus\"></a>\n"
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong>: handle your wireless or cabled network\n"
-"connection<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
+msgid "Activities overview\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>مدیریت شبکه</strong>:شبکه بی‌سیم یا کابلی خود را مدیریت کنید\n"
-"<br/>\n"
-"[[اسناد مرتبط را ببینید|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
+msgid "To access your windows and applications you can either:"
msgstr ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img shutdown.png link=no]]\n"
-msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
-"system</div>\n"
-"</div>\n"
+" - Choose <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Activities Overview</span></span>.\n"
+" - Throw your mouse pointer to the top-left hot corner.\n"
+" - Press the windows key on your keyboard.\n"
msgstr ""
-"<div class=\"text\"><strong>خاموش کردن سیستم</strong>: رایانه را خاموش یا دوباره روشن\n"
-"کنید</div>\n"
-"</div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Bottom panel\n"
-msgstr "تابلوی پایینی\n"
-
-#. type: Plain text
-msgid "On the left of the bottom panel are displayed buttons for open windows."
-msgstr "سمت راست تابلوی پایینی، دکمه‌هایی برای بازکردن پنجره‌ها وجود دارند."
#. type: Plain text
msgid ""
-"On the right of the bottom panel, a set of four similar rectangle icons "
-"gives access to four different workspaces."
+"You can see your windows and applications in the overview. You can also "
+"start typing to search your applications, files, and folders."
msgstr ""
-"سمت چپ تابلوی پایینی، مجموعه‌ای از چهار نمایهٔ چهارگوش می‌بینید که به چهار فضای "
-"کاری مختلف دسترسی می‌دهند."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"shortcuts\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
#. type: Title =
#, no-wrap
@@ -654,20 +583,6 @@ msgstr "میان‌برهای دسکتاپ\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img computer.png link=no]]\n"
-msgstr "[[!img computer.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\"><strong>رایانه</strong>دسترسی به یک دستگاه ذخیره</div>\n"
-"</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
msgstr "[[!img user-home.png link=no]]\n"
@@ -758,6 +673,222 @@ msgstr ""
"چپ بالای صفحه دنبال کنید. برای جابجا کردن فایل‌ها یا پوشه‌ها، می‌توانید آن‌ها را "
"از یک پنجره بکشید و در پنجرهٔ دیگر رها کنید."
+#. type: Plain text
+#, fuzzy, no-wrap
+msgid ""
+"To connect to a remote FTP or SFTP server choose\n"
+"<span class=\"guilabel\">Connect to Server</span></span>.\n"
+msgstr ""
+"برای اتصال به سرور FTP یا SFTP بروید به\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">اتصال به سرور </span></span>\n"
+
+#~ msgid ""
+#~ "This page describes some important features of the desktop in the context "
+#~ "of Tails."
+#~ msgstr "این صفحه درباره بخشی از ویژگی‌های مهم دسکتاپ در تیلز است."
+
+#~ msgid ""
+#~ "The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
+#~ "the GNOME desktop or the system.\n"
+#~ msgstr ""
+#~ "زیرفهرست <span class=\"guisubmenu\">ابزارهای سیستم</span> submenu به شما اجازه می‌دهد\n"
+#~ "دسکتاپ گنوم یا سیستم را مختص خودتان طراحی کنید.\n"
+
+#~ msgid "Among other utilities, it includes:"
+#~ msgstr "سایر کارکردهای کمکی شامل موارد زیر می‌شود:‌"
+
+#, fuzzy
+#~ msgid "[[!img synaptic.png link=no]]\n"
+#~ msgstr "[[!img synaptic.png link=خیر]]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
+#~ " to install, remove, and upgrade software packages choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
+#~ "برای نصب کردن، حذف و به‌روزرسانی یک بسته به این قسمت بروید:\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">ابزار سیستم</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">مدیریت</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+
+#~ msgid "Applications shortcuts\n"
+#~ msgstr "میان‌بر به ابزارها\n"
+
+#~ msgid "Notification area\n"
+#~ msgstr "محل آگهی\n"
+
+#~ msgid ""
+#~ "In the upper right corner you will find a couple of icons, each of which "
+#~ "offers an interface for some system feature or running application. You "
+#~ "are encouraged to check these icons out with the left and right mouse "
+#~ "buttons."
+#~ msgstr ""
+#~ "گوشه سمت چپ بالا، دو نمایه می‌بینید که هرکدام واسطی برای ابزارهای در حال "
+#~ "استفاده و ویژگی‌های ابزارها ارائه می‌دهند. می‌توانید این نمایه‌ها را نگاه "
+#~ "کنید و کاربرد آنها را با کلیدهای چپ و راست موش‌واره امتحان کنید."
+
+#~ msgid "[[!img tor-on.png link=no]]\n"
+#~ msgstr "[[!img tor-on.png link=no]]\n"
+
+#~ msgid "[[!img tor-starting.png link=no]]\n"
+#~ msgstr "[[!img tor-starting.png link=no]]\n"
+
+#~ msgid "[[!img tor-off.png link=no]]\n"
+#~ msgstr "[[!img tor-off.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img gpgApplet-text.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-text.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet-seal.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img sound.png link=no]]\n"
+#~ msgstr "[[!img sound.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
+#~ "volume</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>شدت صدا</strong>: کنترل شدت صدا\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img power.png link=no]]\n"
+#~ msgstr "[[!img power.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong>: information about your battery, if you are using\n"
+#~ "a laptop<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>ابزار مدیریت انرژی</strong>: اطلاعاتی درباره باتری، \n"
+#~ "اگر از رایانه همراه ستفاده می‌کنید<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img keyboard-de.png link=no]]\n"
+#~ msgstr "[[!img keyboard-de.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
+#~ "Right-click to configure a different keyboard layout.</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>ظاهر صفحه‌کلید</strong>: ظاهر کنونی صفحه کلید<br/>\n"
+#~ "برای پیکربندی یک ظاهر جدید صفحه‌کلید راست‌کلیک کنید.</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img network-idle.png link=no]]\n"
+#~ msgstr "[[!img network-idle.png link=no]]\n"
+
+#~ msgid "[[!img network-wired.png link=no]]\n"
+#~ msgstr "[[!img network-wired.png link=no]]\n"
+
+#~ msgid "[[!img network-wireless.png link=no]]\n"
+#~ msgstr "[[!img network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong>: handle your wireless or cabled network\n"
+#~ "connection<br/>\n"
+#~ "[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>مدیریت شبکه</strong>:شبکه بی‌سیم یا کابلی خود را مدیریت کنید\n"
+#~ "<br/>\n"
+#~ "[[اسناد مرتبط را ببینید|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img shutdown.png link=no]]\n"
+#~ msgstr "[[!img shutdown.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
+#~ "system</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>خاموش کردن سیستم</strong>: رایانه را خاموش یا دوباره روشن\n"
+#~ "کنید</div>\n"
+#~ "</div>\n"
+
+#~ msgid "Bottom panel\n"
+#~ msgstr "تابلوی پایینی\n"
+
+#~ msgid ""
+#~ "On the left of the bottom panel are displayed buttons for open windows."
+#~ msgstr "سمت راست تابلوی پایینی، دکمه‌هایی برای بازکردن پنجره‌ها وجود دارند."
+
+#~ msgid ""
+#~ "On the right of the bottom panel, a set of four similar rectangle icons "
+#~ "gives access to four different workspaces."
+#~ msgstr ""
+#~ "سمت چپ تابلوی پایینی، مجموعه‌ای از چهار نمایهٔ چهارگوش می‌بینید که به چهار "
+#~ "فضای کاری مختلف دسترسی می‌دهند."
+
+#~ msgid "[[!img computer.png link=no]]\n"
+#~ msgstr "[[!img computer.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>رایانه</strong>دسترسی به یک دستگاه ذخیره</div>\n"
+#~ "</div>\n"
+
#~ msgid "<a id=\"claws_mail\"></a>\n"
#~ msgstr "<a id=\"claws_mail\"></a>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index 99abf03..bdc2ebc 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-19 00:27+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,24 +22,22 @@ msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
msgstr "[[!meta title=\"Introduction à GNOME et au bureau de Tails\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
+#| "version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-"
+#| "help/3.4/fallback-mode.html.en)."
msgid ""
"The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
-"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
-"fallback-mode.html.en)."
+"more precisely [GNOME Classic](https://help.gnome.org/users/gnome-help/"
+"stable/gnome-classic.html) version 3.14. This page describes some important "
+"features of the desktop in the context of Tails."
msgstr ""
"Tails utilise l'environnement de bureau [GNOME](https://www.gnome.org), "
"version 3.4, dans une version appelée \"Fallback mode\" ou [mode restreint]"
"(https://help.gnome.org/users/gnome-help/3.4/fallback-mode.html.fr)."
#. type: Plain text
-msgid ""
-"This page describes some important features of the desktop in the context of "
-"Tails."
-msgstr ""
-"Cette page décrit les fonctionnalités principales du bureau dans le contexte "
-"de Tails."
-
-#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -61,6 +59,12 @@ msgstr "le menu <span class=\"guimenu\">Applications</span>"
msgid "the <span class=\"guimenu\">Places</span> menu"
msgstr "le menu <span class=\"guimenu\">Raccourcis</span>"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"applications\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
@@ -96,12 +100,20 @@ msgid "[[!img help-browser.png link=no]]\n"
msgstr "[[!img help-browser.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Help</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"guimenuitem\">Help</span>: to access the <span class=\"application\">GNOME Desktop Help</span> choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Help</span></span>\n"
" </div>\n"
"</div>\n"
@@ -114,52 +126,24 @@ msgstr ""
" </div>\n"
"</div>\n"
-#. type: Title ###
-#, no-wrap
-msgid "System Tools submenu"
-msgstr "Le sous-menu Outils système"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
-"the GNOME desktop or the system.\n"
-msgstr ""
-"Le sous-menu <span class=\"guisubmenu\">Outils système</span> vous permet de personnaliser\n"
-"le bureau GNOME et le système.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"next\">\n"
-msgstr "<div class=\"next\">\n"
-
-#. type: Plain text
-msgid ""
-"By default, any such customization is reset when shutting down Tails. Read "
-"the documentation on [[persistence|persistence]] to learn which "
-"configuration can be made persistent across separate working sessions."
-msgstr ""
-"Par défaut, les personnalisations de ce type sont annulées lors de "
-"l'extinction de Tails. Consultez la documentation relative à la "
-"[[persistance|persistence]] pour savoir quelles configurations peuvent être "
-"conservées de manière persistante entre deux sessions de travail."
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid "Among other utilities, it includes:"
-msgstr "Entre autres utilitaires, ce menu contient :"
-
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr "[[!img preferences-system.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">System Settings</span>:\n"
+#| " to change various system settings such as keyboard, mouse and touchpad,\n"
+#| " or displays choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">System Settings</span>:\n"
@@ -167,8 +151,7 @@ msgid ""
" or displays choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span></span>\n"
+" <span class=\"guimenuitem\">Settings</span></span>\n"
" </div>\n"
"</div>\n"
msgstr ""
@@ -184,19 +167,64 @@ msgstr ""
"</div>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"icon\">\n"
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To learn about the many keyboard shortcuts in GNOME, click on\n"
+"<span class=\"guilabel\">Keyboard</span> from the <span class=\"guilabel\">System\n"
+"Settings</span> and open the <span class=\"guilabel\">Shortcuts</span>\n"
+"tab.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"next\">\n"
+msgstr "<div class=\"next\">\n"
+
+#. type: Plain text
+msgid ""
+"By default, any such customization is reset when shutting down Tails. Read "
+"the documentation on [[persistence|persistence]] to learn which "
+"configuration can be made persistent across separate working sessions."
+msgstr ""
+"Par défaut, les personnalisations de ce type sont annulées lors de "
+"l'extinction de Tails. Consultez la documentation relative à la "
+"[[persistance|persistence]] pour savoir quelles configurations peuvent être "
+"conservées de manière persistante entre deux sessions de travail."
+
+#. type: Plain text
#, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
msgstr "[[!img seahorse.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Seahorse</span>:\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">Seahorse</span>:\n"
" to manage your OpenPGP keys choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
" </div>\n"
"</div>\n"
@@ -212,82 +240,23 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img synaptic.png link=no]]\n"
-msgstr "[[!img synaptic.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
-" to install, remove, and upgrade software packages choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
-" </div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Gestionnaire de paquets Synaptic</span> :\n"
-" pour installer, désinstaller ou mettre à jour des paquets logiciels, choisissez\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Outils système</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Gestionnaire de paquets Synaptic</span></span>\n"
-" </div>\n"
-"</div>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Places menu\n"
-msgstr "Menu Raccourcis\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
-"storage media.\n"
-msgstr ""
-"Le menu <span class=\"guimenu\">Raccourcis</span> fournit un accès direct à différents\n"
-"supports de stockage.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr "[[!img places.png link=no alt=\"Raccourcis\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To connect to a remote FTP or SFTP server choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
-msgstr ""
-"Pour vous connecter à un serveur FTP ou SFTP, choisissez\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Raccourcis</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Se connecter à un serveur…</span></span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"app_shortcuts\"></a>\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"favorites\"></a>\n"
msgstr "<a id=\"app_shortcuts\"></a>\n"
-#. type: Title -
+#. type: Title ###
#, no-wrap
-msgid "Applications shortcuts\n"
-msgstr "Raccourcis vers des applications\n"
+msgid "Favorites submenu"
+msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "On the right of these two menu entries, a few shortcuts allow to launch the most frequently used applications."
msgid ""
-"On the right of these two menu entries, a few shortcuts allow to launch the "
-"most frequently used applications."
-msgstr ""
-"Immédiatement à droite des deux menus principaux, se trouvent quelques "
-"raccourcis permettant d'accéder à des applications fréquemment utilisées."
+"In the <span class=\"guisubmenu\">Favorites</span> submenu, a few\n"
+"shortcuts allow you to launch the most frequently used applications:\n"
+msgstr "Immédiatement à droite des deux menus principaux, se trouvent quelques raccourcis permettant d'accéder à des applications fréquemment utilisées."
#. type: Plain text
#, no-wrap
@@ -398,45 +367,56 @@ msgstr ""
"<div class=\"text\"><strong>GNOME Terminal</strong> : pour utiliser la ligne de commande</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"places\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
#. type: Title -
#, no-wrap
-msgid "Notification area\n"
-msgstr "Zone de notification\n"
+msgid "Places menu\n"
+msgstr "Menu Raccourcis\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+#| "storage media.\n"
msgid ""
-"In the upper right corner you will find a couple of icons, each of which "
-"offers an interface for some system feature or running application. You are "
-"encouraged to check these icons out with the left and right mouse buttons."
+"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+"folders and storage media.\n"
msgstr ""
-"Dans le coin supérieur gauche, vous trouverez quelques icônes, chacune offre "
-"un accès a des fonctionnalités du système ou des applications en "
-"fonctionnement. Nous vous encourageons à les explorer avec le bouton gauche "
-"ou droit de la souris."
+"Le menu <span class=\"guimenu\">Raccourcis</span> fournit un accès direct à différents\n"
+"supports de stockage.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img tor-on.png link=no]]\n"
-msgstr "[[!img tor-on.png link=no]]\n"
+msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Raccourcis\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-starting.png link=no]]\n"
-msgstr "[[!img tor-starting.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"vidalia\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img tor-off.png link=no]]\n"
-msgstr "[[!img tor-off.png link=no]]\n"
+msgid "Tor controller\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
+#| "[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
+#| "</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\">\n"
-"<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
-"</div>\n"
-"</div>\n"
+"<span class=\"application\">Vidalia</span> is a graphical controller for\n"
+"Tor. [[See the corresponding documentation.|anonymous_internet/vidalia]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Vidalia</strong> : interface graphique pour Tor<br/>\n"
@@ -445,27 +425,36 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img vidalia.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Raccourcis\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img florence.png link=no]]\n"
-msgstr "[[!img florence.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"florence\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Florence</strong>: virtual keyboard<br/>\n"
-"[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
-"</div>\n"
-"</div>\n"
+"Virtual keyboard\n"
+"-----------------\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Florence</strong>: virtual keyboard<br/>\n"
+#| "[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
+#| "</div>\n"
+#| "</div>\n"
+msgid ""
+"The <span class=\"application\">Florence</span> virtual keyboard can\n"
+"protect you against a hardware keylogger when typing passwords and sensitive text.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/virtual_keyboard]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Florence</strong> : clavier virtuel<br/>\n"
@@ -474,182 +463,154 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr "[[!img gpgApplet-text.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img florence.png link=no]]\n"
+msgid "[[!img florence.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr "[[!img gpgApplet.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"openpgp\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+msgid "OpenPGP applet\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
+#| "clipboard using OpenPGP<br/> [[See the corresponding\n"
+#| "documentation|encryption_and_privacy/gpgapplet]]</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
-"clipboard using OpenPGP<br/> [[See the corresponding\n"
-"documentation|encryption_and_privacy/gpgapplet]]</div>\n"
-"</div>\n"
+"Using the <span class=\"application\">Tails OpenPGP Applet</span> you can\n"
+"encrypt and decrypt the clipboard using OpenPGP.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/gpgapplet]]\n"
msgstr ""
"<div class=\"text\"><strong>Applet OpenPGP de Tails</strong> : chiffrer et déchiffrer le presse-papier avec\n"
"OpenPGP<br/> [[Voir la documentation correspondante|encryption_and_privacy/gpgapplet]]</div>\n"
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img openpgp_applet.png link=no alt=\"Tails OpenPGP Applet\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Raccourcis\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"accessibility\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid "[[!img sound.png link=no]]\n"
-msgstr "[[!img sound.png link=no]]\n"
+msgid "Accessibility tools\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
-"volume</div>\n"
-"</div>\n"
+"The accessibility tools allow you to activate the screen reader, large text "
+"display, and other accessibility features."
msgstr ""
-"<div class=\"text\"><strong>Volume Audio</strong> : contrôle le volume\n"
-"audio</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img power.png link=no]]\n"
-msgstr "[[!img power.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img accessibility.png link=no alt=\"Accessibility tools\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Raccourcis\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"help\"></a>\n"
+msgid "<a id=\"keyboard\"></a>\n"
+msgstr "<a id=\"help\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong>: information about your battery, if you are using\n"
-"a laptop<br/>\n"
-"</div>\n"
-"</div>\n"
+msgid "Keyboard layouts\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong> : informations sur la batterie si vous utilisez un ordinateur portable<br/>\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
+"The keyboard layout menu allow you to change the keyboard layout and input "
+"method for non-Latin scripts."
msgstr ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-en.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img keyboard-en.png link=no]]\n"
+msgid "[[!img keyboard.png link=no alt=\"Keyboard layouts\"]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr "[[!img keyboard-de.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"system\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "System Tools submenu"
+msgid "System menu\n"
+msgstr "Le sous-menu Outils système"
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
-"Right-click to configure a different keyboard layout.</div>\n"
-"</div>\n"
+"In the top-right corner of the top bar, the system menu allows you to manage "
+"your systems settings and your computer."
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Agencement du clavier</strong> : agencement du clavier actuel<br/>\n"
-"Clique-droit pour définir un agencement de clavier différent.</div>\n"
-"</div>\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-idle.png link=no]]\n"
-msgstr "[[!img network-idle.png link=no]]\n"
+msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
+msgstr "[[!img system.png link=no alt=\"Menu système\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-wired.png link=no]]\n"
-msgstr "[[!img network-wired.png link=no]]\n"
+msgid "<p>See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].</p>\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-wireless.png link=no]]\n"
-msgstr "[[!img network-wireless.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"nautilus\"></a>\n"
+msgid "<a id=\"activities\"></a>\n"
+msgstr "<a id=\"nautilus\"></a>\n"
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong>: handle your wireless or cabled network\n"
-"connection<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
+msgid "Activities overview\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong> : gérez vos connexions filaires et sans-fil<br/>\n"
-"[[Voir la documentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
+msgid "To access your windows and applications you can either:"
msgstr ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img shutdown.png link=no]]\n"
-msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
-"system</div>\n"
-"</div>\n"
+" - Choose <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Activities Overview</span></span>.\n"
+" - Throw your mouse pointer to the top-left hot corner.\n"
+" - Press the windows key on your keyboard.\n"
msgstr ""
-"<div class=\"text\"><strong>System Shutdown</strong> : Arrête ou redémarre le\n"
-"système</div>\n"
-"</div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Bottom panel\n"
-msgstr "Panneau inférieur\n"
#. type: Plain text
-msgid "On the left of the bottom panel are displayed buttons for open windows."
+msgid ""
+"You can see your windows and applications in the overview. You can also "
+"start typing to search your applications, files, and folders."
msgstr ""
-"En bas à gauche de l'écran s'affichent des boutons correspondants aux "
-"fenêtres ouvertes."
#. type: Plain text
-msgid ""
-"On the right of the bottom panel, a set of four similar rectangle icons "
-"gives access to four different workspaces."
-msgstr ""
-"En bas à droite de l'écran, quatre rectangles similaires donnent accès à "
-"quatre espaces de travail distincts."
+#, fuzzy, no-wrap
+#| msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"shortcuts\"></a>\n"
+msgstr "<a id=\"app_shortcuts\"></a>\n"
#. type: Title =
#, no-wrap
@@ -658,20 +619,6 @@ msgstr "Raccourcis sur le bureau\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img computer.png link=no]]\n"
-msgstr "[[!img computer.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\"><strong>Poste de travail</strong> : accéder aux médias de stockage</div>\n"
-"</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
msgstr "[[!img user-home.png link=no]]\n"
@@ -765,6 +712,228 @@ msgstr ""
"des fichiers ou dossiers, vous pouvez les faire glisser d'une fenêtre à une "
"autre."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To connect to a remote FTP or SFTP server choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
+msgid ""
+"To connect to a remote FTP or SFTP server choose\n"
+"<span class=\"guilabel\">Connect to Server</span></span>.\n"
+msgstr ""
+"Pour vous connecter à un serveur FTP ou SFTP, choisissez\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Raccourcis</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Se connecter à un serveur…</span></span>\n"
+
+#~ msgid ""
+#~ "This page describes some important features of the desktop in the context "
+#~ "of Tails."
+#~ msgstr ""
+#~ "Cette page décrit les fonctionnalités principales du bureau dans le "
+#~ "contexte de Tails."
+
+#~ msgid ""
+#~ "The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
+#~ "the GNOME desktop or the system.\n"
+#~ msgstr ""
+#~ "Le sous-menu <span class=\"guisubmenu\">Outils système</span> vous permet de personnaliser\n"
+#~ "le bureau GNOME et le système.\n"
+
+#~ msgid "Among other utilities, it includes:"
+#~ msgstr "Entre autres utilitaires, ce menu contient :"
+
+#~ msgid "[[!img synaptic.png link=no]]\n"
+#~ msgstr "[[!img synaptic.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
+#~ " to install, remove, and upgrade software packages choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Gestionnaire de paquets Synaptic</span> :\n"
+#~ " pour installer, désinstaller ou mettre à jour des paquets logiciels, choisissez\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">Outils système</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Gestionnaire de paquets Synaptic</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+
+#~ msgid "Applications shortcuts\n"
+#~ msgstr "Raccourcis vers des applications\n"
+
+#~ msgid "Notification area\n"
+#~ msgstr "Zone de notification\n"
+
+#~ msgid ""
+#~ "In the upper right corner you will find a couple of icons, each of which "
+#~ "offers an interface for some system feature or running application. You "
+#~ "are encouraged to check these icons out with the left and right mouse "
+#~ "buttons."
+#~ msgstr ""
+#~ "Dans le coin supérieur gauche, vous trouverez quelques icônes, chacune "
+#~ "offre un accès a des fonctionnalités du système ou des applications en "
+#~ "fonctionnement. Nous vous encourageons à les explorer avec le bouton "
+#~ "gauche ou droit de la souris."
+
+#~ msgid "[[!img tor-on.png link=no]]\n"
+#~ msgstr "[[!img tor-on.png link=no]]\n"
+
+#~ msgid "[[!img tor-starting.png link=no]]\n"
+#~ msgstr "[[!img tor-starting.png link=no]]\n"
+
+#~ msgid "[[!img tor-off.png link=no]]\n"
+#~ msgstr "[[!img tor-off.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img gpgApplet-text.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-text.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet-seal.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img sound.png link=no]]\n"
+#~ msgstr "[[!img sound.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
+#~ "volume</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Volume Audio</strong> : contrôle le volume\n"
+#~ "audio</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img power.png link=no]]\n"
+#~ msgstr "[[!img power.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong>: information about your battery, if you are using\n"
+#~ "a laptop<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong> : informations sur la batterie si vous utilisez un ordinateur portable<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img keyboard-de.png link=no]]\n"
+#~ msgstr "[[!img keyboard-de.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
+#~ "Right-click to configure a different keyboard layout.</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Agencement du clavier</strong> : agencement du clavier actuel<br/>\n"
+#~ "Clique-droit pour définir un agencement de clavier différent.</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img network-idle.png link=no]]\n"
+#~ msgstr "[[!img network-idle.png link=no]]\n"
+
+#~ msgid "[[!img network-wired.png link=no]]\n"
+#~ msgstr "[[!img network-wired.png link=no]]\n"
+
+#~ msgid "[[!img network-wireless.png link=no]]\n"
+#~ msgstr "[[!img network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong>: handle your wireless or cabled network\n"
+#~ "connection<br/>\n"
+#~ "[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong> : gérez vos connexions filaires et sans-fil<br/>\n"
+#~ "[[Voir la documentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img shutdown.png link=no]]\n"
+#~ msgstr "[[!img shutdown.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
+#~ "system</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>System Shutdown</strong> : Arrête ou redémarre le\n"
+#~ "système</div>\n"
+#~ "</div>\n"
+
+#~ msgid "Bottom panel\n"
+#~ msgstr "Panneau inférieur\n"
+
+#~ msgid ""
+#~ "On the left of the bottom panel are displayed buttons for open windows."
+#~ msgstr ""
+#~ "En bas à gauche de l'écran s'affichent des boutons correspondants aux "
+#~ "fenêtres ouvertes."
+
+#~ msgid ""
+#~ "On the right of the bottom panel, a set of four similar rectangle icons "
+#~ "gives access to four different workspaces."
+#~ msgstr ""
+#~ "En bas à droite de l'écran, quatre rectangles similaires donnent accès à "
+#~ "quatre espaces de travail distincts."
+
+#~ msgid "[[!img computer.png link=no]]\n"
+#~ msgstr "[[!img computer.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Poste de travail</strong> : accéder aux médias de stockage</div>\n"
+#~ "</div>\n"
+
#~ msgid "<a id=\"claws_mail\"></a>\n"
#~ msgstr "<a id=\"claws_mail\"></a>\n"
@@ -820,9 +989,6 @@ msgstr ""
#~ "Le menu **Raccourcis** a pour but de faciliter l'accès à différents "
#~ "supports de stockage."
-#~ msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
-#~ msgstr "[[!img system.png link=no alt=\"Menu système\"]]\n"
-
#~ msgid "Here are a few ones that you might want to check:"
#~ msgstr ""
#~ "En voici quelques-unes auxquelles vous pourriez vouloir jeter un œil :"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
index ea1fef5..914039c 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-08-06 07:18-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,24 +21,22 @@ msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
msgstr "[[!meta title=\"Introdução ao GNOME e à área de trabalho do Tails\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
+#| "version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-"
+#| "help/3.4/fallback-mode.html.en)."
msgid ""
"The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
-"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
-"fallback-mode.html.en)."
+"more precisely [GNOME Classic](https://help.gnome.org/users/gnome-help/"
+"stable/gnome-classic.html) version 3.14. This page describes some important "
+"features of the desktop in the context of Tails."
msgstr ""
"O ambiente de ãrea de trabalho usado no Tails é o [GNOME](https://www.gnome."
"org), versão 3.4 em modo [clássico/alternativo](https://help.gnome.org/users/"
"gnome-help/3.4/fallback-mode.html.pt_BR)."
#. type: Plain text
-msgid ""
-"This page describes some important features of the desktop in the context of "
-"Tails."
-msgstr ""
-"Esta página descreve algumas funcionalidades importantes da área de trabalho "
-"no contexto do Tails."
-
-#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -60,6 +58,12 @@ msgstr "o menu <span class=\"guimenu\">Aplicações</span>"
msgid "the <span class=\"guimenu\">Places</span> menu"
msgstr "o menu <span class=\"guimenu\">Locais</span>"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"applications\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
@@ -108,9 +112,9 @@ msgstr "[[!img tor-on.png link=no]]\n"
#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"guimenuitem\">Help</span>: to access the <span class=\"application\">GNOME Desktop Help</span> choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Help</span></span>\n"
" </div>\n"
"</div>\n"
@@ -125,50 +129,24 @@ msgstr ""
" </div>\n"
"</div>\n"
-#. type: Title ###
-#, no-wrap
-msgid "System Tools submenu"
-msgstr "Submenu de Ferramentas de Sistema"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
-"the GNOME desktop or the system.\n"
-msgstr "O menu <span class=\"guisubmenu\">Ferramentas de Sistema</span> permite a personalização da área de trabalho do GNOME ou do sistema.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"next\">\n"
-msgstr "<div class=\"next\">\n"
-
-#. type: Plain text
-msgid ""
-"By default, any such customization is reset when shutting down Tails. Read "
-"the documentation on [[persistence|persistence]] to learn which "
-"configuration can be made persistent across separate working sessions."
-msgstr ""
-"Por padrão, qualquer personalização é perdida ao desligar o Tails. Leia a "
-"documentação sobre [[persistência|persistente]] para saber quais "
-"configurações podem ser tornadas persistentes em sessões de trabalho "
-"distintas."
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid "Among other utilities, it includes:"
-msgstr "Entre outros utilitários, estão incluídos:"
-
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr "[[!img preferences-system.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">System Settings</span>:\n"
+#| " to change various system settings such as keyboard, mouse and touchpad,\n"
+#| " or displays choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">System Settings</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">System Settings</span>:\n"
@@ -176,8 +154,7 @@ msgid ""
" or displays choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">System Settings</span></span>\n"
+" <span class=\"guimenuitem\">Settings</span></span>\n"
" </div>\n"
"</div>\n"
msgstr ""
@@ -193,19 +170,64 @@ msgstr ""
"</div>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"icon\">\n"
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To learn about the many keyboard shortcuts in GNOME, click on\n"
+"<span class=\"guilabel\">Keyboard</span> from the <span class=\"guilabel\">System\n"
+"Settings</span> and open the <span class=\"guilabel\">Shortcuts</span>\n"
+"tab.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"next\">\n"
+msgstr "<div class=\"next\">\n"
+
+#. type: Plain text
+msgid ""
+"By default, any such customization is reset when shutting down Tails. Read "
+"the documentation on [[persistence|persistence]] to learn which "
+"configuration can be made persistent across separate working sessions."
+msgstr ""
+"Por padrão, qualquer personalização é perdida ao desligar o Tails. Leia a "
+"documentação sobre [[persistência|persistente]] para saber quais "
+"configurações podem ser tornadas persistentes em sessões de trabalho "
+"distintas."
+
+#. type: Plain text
#, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
msgstr "[[!img seahorse.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Seahorse</span>:\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
msgid ""
"<div class=\"text\">\n"
" <span class=\"guimenuitem\">Seahorse</span>:\n"
" to manage your OpenPGP keys choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
" </div>\n"
"</div>\n"
@@ -221,83 +243,23 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img synaptic.png link=no]]\n"
-msgstr "[[!img synaptic.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
-" to install, remove, and upgrade software packages choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
-" </div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\">\n"
-" <span class=\"guimenuitem\">Gerenciador de Pacotes Synaptic</span>:\n"
-" para instalar, remover e atualizar pacotes de programas, escolha\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guisubmenu\">Ferramentas de Sistema</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Administração</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Gerenciador de Pacotes Synaptic</span></span>\n"
-" </div>\n"
-"</div>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Places menu\n"
-msgstr "Menu de Locais\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
-"storage media.\n"
-msgstr ""
-"O menu <span class=\"guimenu\">Locais</span> provê acesso direto a diferentes mídias\n"
-"de armazenamento.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To connect to a remote FTP or SFTP server choose\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
-msgstr ""
-"Para conectar a um FTP remoto ou servidor SFTP, escolha\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Locais</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Conectar a um Servidor…</span></span>\n"
-
-#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<a id=\"terminal\"></a>\n"
-msgid "<a id=\"app_shortcuts\"></a>\n"
+msgid "<a id=\"favorites\"></a>\n"
msgstr "<a id=\"terminal\"></a>\n"
-#. type: Title -
+#. type: Title ###
#, no-wrap
-msgid "Applications shortcuts\n"
-msgstr "Atalhos de aplicações\n"
+msgid "Favorites submenu"
+msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "On the right of these two menu entries, a few shortcuts allow to launch the most frequently used applications."
msgid ""
-"On the right of these two menu entries, a few shortcuts allow to launch the "
-"most frequently used applications."
-msgstr ""
-"À direita destes dois ítens de menu, alguns atalhos permitem abrir as "
-"aplicações mais frequentemente utilizadas."
+"In the <span class=\"guisubmenu\">Favorites</span> submenu, a few\n"
+"shortcuts allow you to launch the most frequently used applications:\n"
+msgstr "À direita destes dois ítens de menu, alguns atalhos permitem abrir as aplicações mais frequentemente utilizadas."
#. type: Plain text
#, fuzzy, no-wrap
@@ -411,45 +373,56 @@ msgstr ""
"<div class=\"text\"><strong>GNOME Terminal</strong>: use a linha de comando</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"places\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
#. type: Title -
#, no-wrap
-msgid "Notification area\n"
-msgstr "Área de notificação\n"
+msgid "Places menu\n"
+msgstr "Menu de Locais\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+#| "storage media.\n"
msgid ""
-"In the upper right corner you will find a couple of icons, each of which "
-"offers an interface for some system feature or running application. You are "
-"encouraged to check these icons out with the left and right mouse buttons."
+"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
+"folders and storage media.\n"
msgstr ""
-"No canto superior direito você encontrará alguns ícones, cada um oferecendo "
-"uma interface para alguma funcionalidade do sistema ou para aplicações em "
-"execução. Você é encorajado/a a consultar este ícones utilizando os botões "
-"esquerdo e direito do mouse."
+"O menu <span class=\"guimenu\">Locais</span> provê acesso direto a diferentes mídias\n"
+"de armazenamento.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img tor-on.png link=no]]\n"
-msgstr "[[!img tor-on.png link=no]]\n"
+msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-starting.png link=no]]\n"
-msgstr "[[!img tor-starting.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"vidalia\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img tor-off.png link=no]]\n"
-msgstr "[[!img tor-off.png link=no]]\n"
+msgid "Tor controller\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
+#| "[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
+#| "</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\">\n"
-"<strong>Vidalia</strong>: graphical controller for Tor<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
-"</div>\n"
-"</div>\n"
+"<span class=\"application\">Vidalia</span> is a graphical controller for\n"
+"Tor. [[See the corresponding documentation.|anonymous_internet/vidalia]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Vidalia</strong>: controlador gráfico para o Tor<br/>\n"
@@ -458,27 +431,36 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"florence\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img vidalia.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img florence.png link=no]]\n"
-msgstr "[[!img florence.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"florence\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Florence</strong>: virtual keyboard<br/>\n"
-"[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
-"</div>\n"
-"</div>\n"
+"Virtual keyboard\n"
+"-----------------\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| "<strong>Florence</strong>: virtual keyboard<br/>\n"
+#| "[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
+#| "</div>\n"
+#| "</div>\n"
+msgid ""
+"The <span class=\"application\">Florence</span> virtual keyboard can\n"
+"protect you against a hardware keylogger when typing passwords and sensitive text.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/virtual_keyboard]]\n"
msgstr ""
"<div class=\"text\">\n"
"<strong>Florence</strong>: teclado virtual<br/>\n"
@@ -487,27 +469,33 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr "[[!img gpgApplet-text.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img florence.png link=no]]\n"
+msgid "[[!img florence.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr "[[!img gpgApplet.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"openpgp\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+msgid "OpenPGP applet\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
+#| "clipboard using OpenPGP<br/> [[See the corresponding\n"
+#| "documentation|encryption_and_privacy/gpgapplet]]</div>\n"
+#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: encryption and decrypt the\n"
-"clipboard using OpenPGP<br/> [[See the corresponding\n"
-"documentation|encryption_and_privacy/gpgapplet]]</div>\n"
-"</div>\n"
+"Using the <span class=\"application\">Tails OpenPGP Applet</span> you can\n"
+"encrypt and decrypt the clipboard using OpenPGP.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/gpgapplet]]\n"
msgstr ""
"<div class=\"text\"><strong>Tails OpenPGP Applet</strong>: área de transferência com criptografia\n"
"que usa OpenPGP<br/> [[Veja a documentação\n"
@@ -515,158 +503,122 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
-msgstr ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img openpgp_applet.png link=no alt=\"Tails OpenPGP Applet\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"accessibility\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid "[[!img sound.png link=no]]\n"
-msgstr "[[!img sound.png link=no]]\n"
+msgid "Accessibility tools\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
-"volume</div>\n"
-"</div>\n"
+"The accessibility tools allow you to activate the screen reader, large text "
+"display, and other accessibility features."
msgstr ""
-"<div class=\"text\"><strong>Audio Volume</strong>: controle o volume\n"
-"do áudio</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img power.png link=no]]\n"
-msgstr "[[!img power.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img accessibility.png link=no alt=\"Accessibility tools\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"keyboard\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong>: information about your battery, if you are using\n"
-"a laptop<br/>\n"
-"</div>\n"
-"</div>\n"
+msgid "Keyboard layouts\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Power Manager</strong>: informações sobre sua bateria, se você\n"
-"estiver utilizando um laptop<br/>\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<a id=\"audio\"></a>\n"
-#| "<div class=\"icon\">\n"
msgid ""
-"<a id=\"keyboard_layout\"></a>\n"
-"<div class=\"icon\">\n"
+"The keyboard layout menu allow you to change the keyboard layout and input "
+"method for non-Latin scripts."
msgstr ""
-"<a id=\"audio\"></a>\n"
-"<div class=\"icon\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-en.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img keyboard-en.png link=no]]\n"
+msgid "[[!img keyboard.png link=no alt=\"Keyboard layouts\"]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr "[[!img keyboard-de.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"system\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "System Tools submenu"
+msgid "System menu\n"
+msgstr "Submenu de Ferramentas de Sistema"
#. type: Plain text
-#, no-wrap
msgid ""
-"<div class=\"text\">\n"
-"<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
-"Right-click to configure a different keyboard layout.</div>\n"
-"</div>\n"
+"In the top-right corner of the top bar, the system menu allows you to manage "
+"your systems settings and your computer."
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Mapa de Teclado</strong>: mapa de teclado teclado atual<br/>\n"
-"Clique com o botão direito para configurar um mapa de teclado diferente.</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-idle.png link=no]]\n"
-msgstr "[[!img network-idle.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Menu de Locais\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-wired.png link=no]]\n"
-msgstr "[[!img network-wired.png link=no]]\n"
+msgid "<p>See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].</p>\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-wireless.png link=no]]\n"
-msgstr "[[!img network-wireless.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"activities\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong>: handle your wireless or cabled network\n"
-"connection<br/>\n"
-"[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
+msgid "Activities overview\n"
msgstr ""
-"<div class=\"text\">\n"
-"<strong>Network Manager</strong>: gerencia sua conexão de rede cabeada ou sem fio<br/>\n"
-"[[Veja a documentação correspondente|anonymous_internet/networkmanager]]\n"
-"</div>\n"
-"</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
+msgid "To access your windows and applications you can either:"
msgstr ""
-"<a id=\"shutdown\"></a>\n"
-"<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img shutdown.png link=no]]\n"
-msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
-"system</div>\n"
-"</div>\n"
+" - Choose <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Activities Overview</span></span>.\n"
+" - Throw your mouse pointer to the top-left hot corner.\n"
+" - Press the windows key on your keyboard.\n"
msgstr ""
-"<div class=\"text\"><strong>Desligamento do Sistema</strong>: desligue ou reinicie\n"
-"o sistema</div>\n"
-"</div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Bottom panel\n"
-msgstr "Painel inferior\n"
#. type: Plain text
-msgid "On the left of the bottom panel are displayed buttons for open windows."
+msgid ""
+"You can see your windows and applications in the overview. You can also "
+"start typing to search your applications, files, and folders."
msgstr ""
-"Do lado esquerdo do painel inferior são mostrados botões para abrir janelas."
#. type: Plain text
-msgid ""
-"On the right of the bottom panel, a set of four similar rectangle icons "
-"gives access to four different workspaces."
-msgstr ""
-"À direita do painel inferior, um conjunto de quatro ícones retangulares "
-"similares dão acesso a quatro espaços de trabalho diferentes."
+#, fuzzy, no-wrap
+#| msgid "<a id=\"terminal\"></a>\n"
+msgid "<a id=\"shortcuts\"></a>\n"
+msgstr "<a id=\"terminal\"></a>\n"
#. type: Title =
#, no-wrap
@@ -675,20 +627,6 @@ msgstr "Atalhos da Área de Trabalho\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img computer.png link=no]]\n"
-msgstr "[[!img computer.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
-"</div>\n"
-msgstr ""
-"<div class=\"text\"><strong>Computador</strong>: acesse mídias de armazenamento</div>\n"
-"</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
msgstr "[[!img user-home.png link=no]]\n"
@@ -786,6 +724,231 @@ msgstr ""
"arquivos ou pastas, você pode arrastá-los a partir de uma janela e soltá-los "
"em outra."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To connect to a remote FTP or SFTP server choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Places</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
+msgid ""
+"To connect to a remote FTP or SFTP server choose\n"
+"<span class=\"guilabel\">Connect to Server</span></span>.\n"
+msgstr ""
+"Para conectar a um FTP remoto ou servidor SFTP, escolha\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Locais</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Conectar a um Servidor…</span></span>\n"
+
+#~ msgid ""
+#~ "This page describes some important features of the desktop in the context "
+#~ "of Tails."
+#~ msgstr ""
+#~ "Esta página descreve algumas funcionalidades importantes da área de "
+#~ "trabalho no contexto do Tails."
+
+#~ msgid ""
+#~ "The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
+#~ "the GNOME desktop or the system.\n"
+#~ msgstr "O menu <span class=\"guisubmenu\">Ferramentas de Sistema</span> permite a personalização da área de trabalho do GNOME ou do sistema.\n"
+
+#~ msgid "Among other utilities, it includes:"
+#~ msgstr "Entre outros utilitários, estão incluídos:"
+
+#~ msgid "[[!img synaptic.png link=no]]\n"
+#~ msgstr "[[!img synaptic.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span>:\n"
+#~ " to install, remove, and upgrade software packages choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administration</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Synaptic Package Manager</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ " <span class=\"guimenuitem\">Gerenciador de Pacotes Synaptic</span>:\n"
+#~ " para instalar, remover e atualizar pacotes de programas, escolha\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guisubmenu\">Ferramentas de Sistema</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Administração</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Gerenciador de Pacotes Synaptic</span></span>\n"
+#~ " </div>\n"
+#~ "</div>\n"
+
+#~ msgid "Applications shortcuts\n"
+#~ msgstr "Atalhos de aplicações\n"
+
+#~ msgid "Notification area\n"
+#~ msgstr "Área de notificação\n"
+
+#~ msgid ""
+#~ "In the upper right corner you will find a couple of icons, each of which "
+#~ "offers an interface for some system feature or running application. You "
+#~ "are encouraged to check these icons out with the left and right mouse "
+#~ "buttons."
+#~ msgstr ""
+#~ "No canto superior direito você encontrará alguns ícones, cada um "
+#~ "oferecendo uma interface para alguma funcionalidade do sistema ou para "
+#~ "aplicações em execução. Você é encorajado/a a consultar este ícones "
+#~ "utilizando os botões esquerdo e direito do mouse."
+
+#~ msgid "[[!img tor-on.png link=no]]\n"
+#~ msgstr "[[!img tor-on.png link=no]]\n"
+
+#~ msgid "[[!img tor-starting.png link=no]]\n"
+#~ msgstr "[[!img tor-starting.png link=no]]\n"
+
+#~ msgid "[[!img tor-off.png link=no]]\n"
+#~ msgstr "[[!img tor-off.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"florence\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img gpgApplet-text.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-text.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet-seal.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+
+#~ msgid ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img sound.png link=no]]\n"
+#~ msgstr "[[!img sound.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Audio Volume</strong>: control the audio\n"
+#~ "volume</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Audio Volume</strong>: controle o volume\n"
+#~ "do áudio</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img power.png link=no]]\n"
+#~ msgstr "[[!img power.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong>: information about your battery, if you are using\n"
+#~ "a laptop<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Power Manager</strong>: informações sobre sua bateria, se você\n"
+#~ "estiver utilizando um laptop<br/>\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<a id=\"audio\"></a>\n"
+#~| "<div class=\"icon\">\n"
+#~ msgid ""
+#~ "<a id=\"keyboard_layout\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"audio\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img keyboard-de.png link=no]]\n"
+#~ msgstr "[[!img keyboard-de.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Keyboard Layout</strong>: current keyboard layout<br/>\n"
+#~ "Right-click to configure a different keyboard layout.</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Mapa de Teclado</strong>: mapa de teclado teclado atual<br/>\n"
+#~ "Clique com o botão direito para configurar um mapa de teclado diferente.</div>\n"
+#~ "</div>\n"
+
+#~ msgid "[[!img network-idle.png link=no]]\n"
+#~ msgstr "[[!img network-idle.png link=no]]\n"
+
+#~ msgid "[[!img network-wired.png link=no]]\n"
+#~ msgstr "[[!img network-wired.png link=no]]\n"
+
+#~ msgid "[[!img network-wireless.png link=no]]\n"
+#~ msgstr "[[!img network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong>: handle your wireless or cabled network\n"
+#~ "connection<br/>\n"
+#~ "[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\">\n"
+#~ "<strong>Network Manager</strong>: gerencia sua conexão de rede cabeada ou sem fio<br/>\n"
+#~ "[[Veja a documentação correspondente|anonymous_internet/networkmanager]]\n"
+#~ "</div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+#~ msgstr ""
+#~ "<a id=\"shutdown\"></a>\n"
+#~ "<div class=\"icon\">\n"
+
+#~ msgid "[[!img shutdown.png link=no]]\n"
+#~ msgstr "[[!img shutdown.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>System Shutdown</strong>: shut down or restart the\n"
+#~ "system</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Desligamento do Sistema</strong>: desligue ou reinicie\n"
+#~ "o sistema</div>\n"
+#~ "</div>\n"
+
+#~ msgid "Bottom panel\n"
+#~ msgstr "Painel inferior\n"
+
+#~ msgid ""
+#~ "On the left of the bottom panel are displayed buttons for open windows."
+#~ msgstr ""
+#~ "Do lado esquerdo do painel inferior são mostrados botões para abrir "
+#~ "janelas."
+
+#~ msgid ""
+#~ "On the right of the bottom panel, a set of four similar rectangle icons "
+#~ "gives access to four different workspaces."
+#~ msgstr ""
+#~ "À direita do painel inferior, um conjunto de quatro ícones retangulares "
+#~ "similares dão acesso a quatro espaços de trabalho diferentes."
+
+#~ msgid "[[!img computer.png link=no]]\n"
+#~ msgstr "[[!img computer.png link=no]]\n"
+
+#~ msgid ""
+#~ "<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Computador</strong>: acesse mídias de armazenamento</div>\n"
+#~ "</div>\n"
+
#, fuzzy
#~| msgid "<a id=\"terminal\"></a>\n"
#~ msgid "<a id=\"claws_mail\"></a>\n"
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.de.po b/wiki/src/doc/first_steps/persistence/change_passphrase.de.po
index 7f98023..7901466 100644
--- a/wiki/src/doc/first_steps/persistence/change_passphrase.de.po
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 21:15+0300\n"
+"POT-Creation-Date: 2016-01-29 20:48+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"
@@ -21,39 +21,29 @@ msgstr ""
msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Start GNOME Disk utility\n"
+#. type: Bullet: ' 1. '
+msgid ""
+"While starting Tails, [[set up an administration password |doc/first_steps/"
+"startup_options/administration_password]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+" 1. Open <span class=\"application\">Disks</span> from the menu\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
-" </span>.\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Find out the device of the persistent volume\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
-"devices in the left pane of the window. When you select one of these devices,\n"
-"detailed information about it is displayed in the right pane: its partitions,\n"
-"its brand, its size, etc.\n"
+" <span class=\"application\">Disks</span> lists all the current storage\n"
+" devices in the left pane of the window. When you select one of these devices,\n"
+" detailed information about it is displayed in the right pane: its partitions,\n"
+" its brand, its size, etc.\n"
msgstr ""
#. type: Bullet: ' 1. '
@@ -66,34 +56,32 @@ msgstr ""
#. type: Bullet: ' 1. '
msgid ""
-"In the right pane of the window, verify that the device corresponds to your "
-"device, its brand, its size, etc."
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Change the passphrase of the persistent volume\n"
+"In the right pane, click on the persistent volume partition, labelled <span "
+"class=\"guilabel\">TailsData</span>."
msgstr ""
#. type: Bullet: ' 1. '
msgid ""
-"In the right pane, select the persistent volume partition, labelled <span "
-"class=\"guilabel\">Encrypted</span> by clicking on it."
+"Click on <span class=\"guimenu\">[[!img lib/system-run.png alt=\"Disks "
+"context menu\" class=\"symbolic\" link=\"no\"]]</span> and choose <span "
+"class=\"guilabel\">Change Passphrase…</span>."
msgstr ""
-#. type: Bullet: ' 2. '
-msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+#. type: Bullet: ' 1. '
+msgid "Type your current passphrase and then type twice a new one."
msgstr ""
-#. type: Bullet: ' 3. '
-msgid "Type your current passphrase and then type twice a new one."
+#. type: Bullet: ' 1. '
+msgid "Finally confirm by clicking <span class=\"guilabel\">Change</span>."
msgstr ""
-#. type: Bullet: ' 4. '
-msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, enter your administration password and click "
+"<span class=\"guilabel\">Authenticate</span>."
msgstr ""
-#. type: Bullet: ' 5. '
+#. type: Bullet: ' 1. '
msgid ""
"You now can restart Tails and try to enable the persistent volume with its "
"new passphrase."
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.fa.po b/wiki/src/doc/first_steps/persistence/change_passphrase.fa.po
index eb0edaf..4c8d49d 100644
--- a/wiki/src/doc/first_steps/persistence/change_passphrase.fa.po
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.fa.po
@@ -6,11 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-26 10:31+0200\n"
+"POT-Creation-Date: 2016-01-29 20:48+0100\n"
"PO-Revision-Date: 2015-10-10 13:04+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/first_ste"
-"ps_persiatence_passphrase/fa/>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
+"first_steps_persiatence_passphrase/fa/>\n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,50 +23,50 @@ msgstr ""
msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
msgstr "[[!meta title=\"تغییر گذرواژهٔ درایو مانا\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr "[[!toc levels=2]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Start GNOME Disk utility\n"
-msgstr "باز کردن ابزار دیسک گنوم\n"
+#. type: Bullet: ' 1. '
+msgid ""
+"While starting Tails, [[set up an administration password |doc/first_steps/"
+"startup_options/administration_password]]."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>.\n"
msgid ""
-" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+" 1. Open <span class=\"application\">Disks</span> from the menu\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
-" </span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
-" ۱. <span class=\"application\">ابزار دیسک گنوم</span> را از فهرست باز "
-"کنید\n"
+" ۱. <span class=\"application\">ابزار دیسک گنوم</span> را از فهرست باز کنید\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">ابزارها</span>&nbsp;◀\n"
" <span class=\"guisubmenu\">ابزارهای کمکی</span>&nbsp;◀\n"
" <span class=\"guimenuitem\">ابزار دیسک</span>\n"
" </span>.\n"
-#. type: Title =
-#, no-wrap
-msgid "Find out the device of the persistent volume\n"
-msgstr "دستگاه درایو مانا را پیدا کنید\n"
-
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices in the left pane of the window. When you select one of these devices,\n"
+#| "detailed information about it is displayed in the right pane: its partitions,\n"
+#| "its brand, its size, etc.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
-"devices in the left pane of the window. When you select one of these devices,\n"
-"detailed information about it is displayed in the right pane: its partitions,\n"
-"its brand, its size, etc.\n"
+" <span class=\"application\">Disks</span> lists all the current storage\n"
+" devices in the left pane of the window. When you select one of these devices,\n"
+" detailed information about it is displayed in the right pane: its partitions,\n"
+" its brand, its size, etc.\n"
msgstr ""
"<span class=\"application\">ابزار دیسک</span> فهرستی از تمام\n"
-"دستگاه‌های ذخیرهٔ فعلی در سمت راست پنجره دارد. با انتخاب یکی از این دستگاه‌"
-"ها\n"
+"دستگاه‌های ذخیرهٔ فعلی در سمت راست پنجره دارد. با انتخاب یکی از این دستگاه‌ها\n"
"اطلاعات مشروح مربوط به آن سمت چپ پنجره دیده می‌شوند از جمله: بخش‌های آن،\n"
"مارک آن، حجمش و غیره.\n"
@@ -82,44 +82,64 @@ msgstr ""
"دیگری به نام <span class=\"guilabel\">TailsData</span>."
#. type: Bullet: ' 1. '
+#, fuzzy
msgid ""
-"In the right pane of the window, verify that the device corresponds to your "
-"device, its brand, its size, etc."
+"In the right pane, click on the persistent volume partition, labelled <span "
+"class=\"guilabel\">TailsData</span>."
msgstr ""
-"مطمئن شوید که این دستگاه، همان دستگاه مورد نظر شما است. در سمت چپ پنجره مارک،"
-" اندازهٔ آن و غیره را بررسی کنید."
-
-#. type: Title =
-#, no-wrap
-msgid "Change the passphrase of the persistent volume\n"
-msgstr "تغییر گذرواژهٔ درایو مانا\n"
+"در سمت چپ روی پارتیشن درایو مانا با عنوان <span class=\"guilabel"
+"\">Encrypted</span> کلیک و آن را انتخاب کنید."
#. type: Bullet: ' 1. '
-#, fuzzy
msgid ""
-"In the right pane, select the persistent volume partition, labelled <span "
-"class=\"guilabel\">Encrypted</span> by clicking on it."
+"Click on <span class=\"guimenu\">[[!img lib/system-run.png alt=\"Disks "
+"context menu\" class=\"symbolic\" link=\"no\"]]</span> and choose <span "
+"class=\"guilabel\">Change Passphrase…</span>."
msgstr ""
-"در سمت چپ روی پارتیشن درایو مانا با عنوان <span class=\"guilabel\""
-">Encrypted</span> کلیک و آن را انتخاب کنید."
-#. type: Bullet: ' 2. '
-msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
-msgstr "روی <span class=\"guilabel\">تغییر گذرواژه</span> کلیک کنید."
-
-#. type: Bullet: ' 3. '
+#. type: Bullet: ' 1. '
msgid "Type your current passphrase and then type twice a new one."
msgstr "ابتدا گذرواژهٔ فعلی خود و سپس دو بار گذرواژهٔ جدیدتان را تایپ کنید."
-#. type: Bullet: ' 4. '
-msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgid "Finally confirm by clicking <span class=\"guilabel\">Change</span>."
msgstr ""
"در مرحلهٔ آخر روی <span class=\"guilabel\">تغییر گذرواژه</span> کلیک کنید."
-#. type: Bullet: ' 5. '
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, enter your administration password and click "
+"<span class=\"guilabel\">Authenticate</span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
"You now can restart Tails and try to enable the persistent volume with its "
"new passphrase."
msgstr ""
-"حالا می‌توانید تیلز را دوباره راه‌اندازی کرده و درایو مانا را با گذرواژهٔ "
-"جدیدش فعال کنید."
+"حالا می‌توانید تیلز را دوباره راه‌اندازی کرده و درایو مانا را با گذرواژهٔ جدیدش "
+"فعال کنید."
+
+#~ msgid "[[!toc levels=2]]\n"
+#~ msgstr "[[!toc levels=2]]\n"
+
+#~ msgid "Start GNOME Disk utility\n"
+#~ msgstr "باز کردن ابزار دیسک گنوم\n"
+
+#~ msgid "Find out the device of the persistent volume\n"
+#~ msgstr "دستگاه درایو مانا را پیدا کنید\n"
+
+#~ msgid ""
+#~ "In the right pane of the window, verify that the device corresponds to "
+#~ "your device, its brand, its size, etc."
+#~ msgstr ""
+#~ "مطمئن شوید که این دستگاه، همان دستگاه مورد نظر شما است. در سمت چپ پنجره "
+#~ "مارک، اندازهٔ آن و غیره را بررسی کنید."
+
+#~ msgid "Change the passphrase of the persistent volume\n"
+#~ msgstr "تغییر گذرواژهٔ درایو مانا\n"
+
+#~ msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+#~ msgstr "روی <span class=\"guilabel\">تغییر گذرواژه</span> کلیک کنید."
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po b/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po
index e232717..05bc5b6 100644
--- a/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-09 21:15+0300\n"
+"POT-Creation-Date: 2016-01-29 20:48+0100\n"
"PO-Revision-Date: 2015-10-20 02:10+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,25 +21,27 @@ msgstr ""
msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
msgstr "[[!meta title=\"Changer la phrase de passe du volume persistant\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr "[[!toc levels=2]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Start GNOME Disk utility\n"
-msgstr "Lancer l'Utilitaire de disque GNOME\n"
+#. type: Bullet: ' 1. '
+msgid ""
+"While starting Tails, [[set up an administration password |doc/first_steps/"
+"startup_options/administration_password]]."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>.\n"
msgid ""
-" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+" 1. Open <span class=\"application\">Disks</span> from the menu\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
-" </span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
" 1. Ouvrir l'<span class=\"application\">Utilitaire de disque GNOME</span> depuis le menu\n"
" <span class=\"menuchoice\">\n"
@@ -48,18 +50,18 @@ msgstr ""
" <span class=\"guimenuitem\">Utilitaire de disque</span>\n"
" </span>.\n"
-#. type: Title =
-#, no-wrap
-msgid "Find out the device of the persistent volume\n"
-msgstr "Trouver le périphérique du volume persistant\n"
-
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices in the left pane of the window. When you select one of these devices,\n"
+#| "detailed information about it is displayed in the right pane: its partitions,\n"
+#| "its brand, its size, etc.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
-"devices in the left pane of the window. When you select one of these devices,\n"
-"detailed information about it is displayed in the right pane: its partitions,\n"
-"its brand, its size, etc.\n"
+" <span class=\"application\">Disks</span> lists all the current storage\n"
+" devices in the left pane of the window. When you select one of these devices,\n"
+" detailed information about it is displayed in the right pane: its partitions,\n"
+" its brand, its size, etc.\n"
msgstr ""
"L'<span class=\"application\">Utilitaire de disque</span> liste tous les périphériques\n"
"de stockage dans la partie gauche de la fenêtre. Lorsque vous choisissez l'un de ces\n"
@@ -79,46 +81,70 @@ msgstr ""
"volume persistant."
#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane, select the persistent volume partition, labelled <span "
+#| "class=\"guilabel\">Encrypted</span> by clicking on it."
msgid ""
-"In the right pane of the window, verify that the device corresponds to your "
-"device, its brand, its size, etc."
-msgstr ""
-"Dans la partie droite de la fenêtre, vérifier que le périphérique correspond "
-"au votre, sa marque, sa taille, etc."
-
-#. type: Title =
-#, no-wrap
-msgid "Change the passphrase of the persistent volume\n"
-msgstr "Changer la phrase de passe du volume persistant\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"In the right pane, select the persistent volume partition, labelled <span "
-"class=\"guilabel\">Encrypted</span> by clicking on it."
+"In the right pane, click on the persistent volume partition, labelled <span "
+"class=\"guilabel\">TailsData</span>."
msgstr ""
"Dans la partie droite, choisir la partition du volume persistant, appelé "
"<span class=\"guilabel\">Chiffré</span> en cliquant dessus."
-#. type: Bullet: ' 2. '
-msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+#. type: Bullet: ' 1. '
+msgid ""
+"Click on <span class=\"guimenu\">[[!img lib/system-run.png alt=\"Disks "
+"context menu\" class=\"symbolic\" link=\"no\"]]</span> and choose <span "
+"class=\"guilabel\">Change Passphrase…</span>."
msgstr ""
-"Cliquer sur <span class=\"guilabel\">Changer la phrase de passe</span>."
-#. type: Bullet: ' 3. '
+#. type: Bullet: ' 1. '
msgid "Type your current passphrase and then type twice a new one."
msgstr ""
"Taper votre phrase de passe actuelle et taper ensuite deux fois la nouvelle "
"phrase de passe."
-#. type: Bullet: ' 4. '
-msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgid "Finally confirm by clicking <span class=\"guilabel\">Change</span>."
msgstr ""
"Cliquer enfin sur <span class=\"guilabel\">Changer la phrase de passe</span>."
-#. type: Bullet: ' 5. '
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, enter your administration password and click "
+"<span class=\"guilabel\">Authenticate</span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
"You now can restart Tails and try to enable the persistent volume with its "
"new passphrase."
msgstr ""
"Vous pouvez désormais redémarrer Tails et essayer d'activer le volume "
"persistant avec sa nouvelle phrase de passe."
+
+#~ msgid "[[!toc levels=2]]\n"
+#~ msgstr "[[!toc levels=2]]\n"
+
+#~ msgid "Start GNOME Disk utility\n"
+#~ msgstr "Lancer l'Utilitaire de disque GNOME\n"
+
+#~ msgid "Find out the device of the persistent volume\n"
+#~ msgstr "Trouver le périphérique du volume persistant\n"
+
+#~ msgid ""
+#~ "In the right pane of the window, verify that the device corresponds to "
+#~ "your device, its brand, its size, etc."
+#~ msgstr ""
+#~ "Dans la partie droite de la fenêtre, vérifier que le périphérique "
+#~ "correspond au votre, sa marque, sa taille, etc."
+
+#~ msgid "Change the passphrase of the persistent volume\n"
+#~ msgstr "Changer la phrase de passe du volume persistant\n"
+
+#~ msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+#~ msgstr ""
+#~ "Cliquer sur <span class=\"guilabel\">Changer la phrase de passe</span>."
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn b/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn
index 0d0f659..6ba176b 100644
--- a/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn
@@ -1,43 +1,35 @@
[[!meta title="Change the passphrase of the persistent volume"]]
-[[!toc levels=2]]
+ 1. While starting Tails, [[set up an administration password
+ |doc/first_steps/startup_options/administration_password]].
-Start GNOME Disk utility
-========================
-
- 1. Open <span class="application">GNOME Disk Utility</span> from the menu
+ 1. Open <span class="application">Disks</span> from the menu
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">Disk Utility</span>
- </span>.
-
-Find out the device of the persistent volume
-============================================
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Disks</span></span>.
-<span class="application">Disk Utility</span> lists all the current storage
-devices in the left pane of the window. When you select one of these devices,
-detailed information about it is displayed in the right pane: its partitions,
-its brand, its size, etc.
+ <span class="application">Disks</span> lists all the current storage
+ devices in the left pane of the window. When you select one of these devices,
+ detailed information about it is displayed in the right pane: its partitions,
+ its brand, its size, etc.
1. Find which device contains the persistent volume. It should have
two partitions, one labelled <span class="guilabel">Tails</span>, and another
one labelled <span class="guilabel">TailsData</span> which corresponds to the persistent volume.
- 1. In the right pane of the window, verify that the device corresponds
- to your device, its brand, its size, etc.
-
-Change the passphrase of the persistent volume
-==============================================
+ 1. In the right pane, click on the persistent volume partition,
+ labelled <span class="guilabel">TailsData</span>.
- 1. In the right pane, select the persistent volume partition,
- labelled <span class="guilabel">Encrypted</span> by clicking on it.
+ 1. Click on <span class="guimenu">[[!img lib/system-run.png alt="Disks context menu" class="symbolic" link="no"]]</span>
+ and choose <span class="guilabel">Change Passphrase…</span>.
- 2. Click on <span class="guilabel">Change Passphrase</span>.
+ 1. Type your current passphrase and then type twice a new one.
- 3. Type your current passphrase and then type twice a new one.
+ 1. Finally confirm by clicking <span class="guilabel">Change</span>.
- 4. Finally click on <span class="guilabel">Change passphrase</span>.
+ 1. In the confirmation dialog, enter your administration password and click
+ <span class="guilabel">Authenticate</span>.
- 5. You now can restart Tails and try to enable the persistent volume
+ 1. You now can restart Tails and try to enable the persistent volume
with its new passphrase.
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po b/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
index 3515c37..d038dec 100644
--- a/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 21:15+0300\n"
+"POT-Creation-Date: 2016-01-29 20:48+0100\n"
"PO-Revision-Date: 2014-07-17 15:57-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,25 +20,27 @@ msgstr ""
msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
msgstr "[[!meta title=\"Altere a senha do volume persistente\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr "[[!toc levels=2]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Start GNOME Disk utility\n"
-msgstr "Inicie o Utilitário de Disco do GNOME\n"
+#. type: Bullet: ' 1. '
+msgid ""
+"While starting Tails, [[set up an administration password |doc/first_steps/"
+"startup_options/administration_password]]."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>.\n"
msgid ""
-" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+" 1. Open <span class=\"application\">Disks</span> from the menu\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
-" </span>.\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
msgstr ""
" 1. Abra o <span class=\"application\">Utilitário de Disco do GNOME</span> a partir do menu\n"
" <span class=\"menuchoice\">\n"
@@ -47,18 +49,18 @@ msgstr ""
" <span class=\"guimenuitem\">Utilitário de Disco</span>\n"
" </span>.\n"
-#. type: Title =
-#, no-wrap
-msgid "Find out the device of the persistent volume\n"
-msgstr "Encontre o dispositivo do volume persistente\n"
-
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Disk Utility</span> lists all the current storage\n"
+#| "devices in the left pane of the window. When you select one of these devices,\n"
+#| "detailed information about it is displayed in the right pane: its partitions,\n"
+#| "its brand, its size, etc.\n"
msgid ""
-"<span class=\"application\">Disk Utility</span> lists all the current storage\n"
-"devices in the left pane of the window. When you select one of these devices,\n"
-"detailed information about it is displayed in the right pane: its partitions,\n"
-"its brand, its size, etc.\n"
+" <span class=\"application\">Disks</span> lists all the current storage\n"
+" devices in the left pane of the window. When you select one of these devices,\n"
+" detailed information about it is displayed in the right pane: its partitions,\n"
+" its brand, its size, etc.\n"
msgstr ""
"O <span class=\"application\">Utilitário de Disco</span> lista todos os dispositivos\n"
"de armazenamento atuais no painel esquerdo da janela. Quando você seleciona um \n"
@@ -78,46 +80,66 @@ msgstr ""
"persistente."
#. type: Bullet: ' 1. '
-msgid ""
-"In the right pane of the window, verify that the device corresponds to your "
-"device, its brand, its size, etc."
-msgstr ""
-"No painel direito da janela, verifique que o dispositivo corresponde ao seu "
-"dispositivo, confira a marca, tamanho, etc."
-
-#. type: Title =
-#, no-wrap
-msgid "Change the passphrase of the persistent volume\n"
-msgstr "Altere a senha do volume persistente\n"
-
-#. type: Bullet: ' 1. '
#, fuzzy
#| msgid ""
#| "In the right pane, select the persistent volume partition, labelled <span "
#| "class=\"guilabel\">TailsData</span> by clicking on it."
msgid ""
-"In the right pane, select the persistent volume partition, labelled <span "
-"class=\"guilabel\">Encrypted</span> by clicking on it."
+"In the right pane, click on the persistent volume partition, labelled <span "
+"class=\"guilabel\">TailsData</span>."
msgstr ""
"No painel direito, selecione a partição do volume persistente, chamada <span "
"class=\"TailsData\">, clicando nela."
-#. type: Bullet: ' 2. '
-msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
-msgstr "Clique em <span class=\"guilabel\">Alterar Senha</span>."
+#. type: Bullet: ' 1. '
+msgid ""
+"Click on <span class=\"guimenu\">[[!img lib/system-run.png alt=\"Disks "
+"context menu\" class=\"symbolic\" link=\"no\"]]</span> and choose <span "
+"class=\"guilabel\">Change Passphrase…</span>."
+msgstr ""
-#. type: Bullet: ' 3. '
+#. type: Bullet: ' 1. '
msgid "Type your current passphrase and then type twice a new one."
msgstr "Digite sua senha atual e em seguida digite a nova senha."
-#. type: Bullet: ' 4. '
-msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgid "Finally confirm by clicking <span class=\"guilabel\">Change</span>."
msgstr "Finalmente, clique em <span class=\"guilabel\">Alterar senha</span>."
-#. type: Bullet: ' 5. '
+#. type: Bullet: ' 1. '
+msgid ""
+"In the confirmation dialog, enter your administration password and click "
+"<span class=\"guilabel\">Authenticate</span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
"You now can restart Tails and try to enable the persistent volume with its "
"new passphrase."
msgstr ""
"Agora você pode reiniciar o Tails e tentar habilitar o volume persistente "
"com a nova senha."
+
+#~ msgid "[[!toc levels=2]]\n"
+#~ msgstr "[[!toc levels=2]]\n"
+
+#~ msgid "Start GNOME Disk utility\n"
+#~ msgstr "Inicie o Utilitário de Disco do GNOME\n"
+
+#~ msgid "Find out the device of the persistent volume\n"
+#~ msgstr "Encontre o dispositivo do volume persistente\n"
+
+#~ msgid ""
+#~ "In the right pane of the window, verify that the device corresponds to "
+#~ "your device, its brand, its size, etc."
+#~ msgstr ""
+#~ "No painel direito da janela, verifique que o dispositivo corresponde ao "
+#~ "seu dispositivo, confira a marca, tamanho, etc."
+
+#~ msgid "Change the passphrase of the persistent volume\n"
+#~ msgstr "Altere a senha do volume persistente\n"
+
+#~ msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+#~ msgstr "Clique em <span class=\"guilabel\">Alterar Senha</span>."
diff --git a/wiki/src/doc/first_steps/persistence/claws-mail.png b/wiki/src/doc/first_steps/persistence/claws-mail.png
deleted file mode 100644
index b9cc28d..0000000
--- a/wiki/src/doc/first_steps/persistence/claws-mail.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/first_steps/persistence/copy.de.po b/wiki/src/doc/first_steps/persistence/copy.de.po
index ab25d22..c0368d3 100644
--- a/wiki/src/doc/first_steps/persistence/copy.de.po
+++ b/wiki/src/doc/first_steps/persistence/copy.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-02-04 16:01+0100\n"
"PO-Revision-Date: 2015-11-04 21:10+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -64,9 +64,13 @@ msgstr ""
"Speicherbereich."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
msgstr ""
"Starten Sie Tails neu, aktivieren Sie den beständigen Speicherbereich und "
"[[stellen Sie ein Administrationskennwort ein|startup_options/"
@@ -89,15 +93,23 @@ msgstr ""
"möchten."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>\n"
+#| " to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span>\n"
" </span>\n"
-" to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
+" to open <span class=\"application\">GNOME Disks</span>.\n"
msgstr ""
"1. Wählen Sie\n"
" <span class=\"menuchoice\">\n"
@@ -115,10 +127,15 @@ msgstr ""
"Medium entspricht."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane, click on the partition labeled as <span class="
+#| "\"guilabel\">Encrypted</span>. The <span class=\"guilabel\">Partition "
+#| "Label</span> must be <span class=\"label\">TailsData</span>."
msgid ""
"In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
msgstr ""
"Wählen Sie im rechten Fensterbereich die Partition mit dem Namen <span class="
"\"guilabel\">Verschlüsselt</span> aus. Die <span class=\"guilabel"
@@ -126,10 +143,16 @@ msgstr ""
"lauten."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
+#| "persistent volume. Enter the passphrase of the old persistent volume and "
+#| "click <span class=\"guilabel\">Unlock</span>."
msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume. Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
msgstr ""
"Klicken Sie auf <span class=\"guilabel\">Datenträger entsperren</span>, um "
"den alten beständigen Speicherbereich zu entsperren. Geben Sie die "
@@ -137,17 +160,29 @@ msgstr ""
"class=\"guilabel\">Entsperren</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on the <span class=\"guilabel\">TailsData</span> partition that "
+#| "appears below the <span class=\"guilabel\">Encrypted Volume</span> "
+#| "partition."
msgid ""
"Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
msgstr ""
"Wählen Sie die <span class=\"guilabel\">TailsData</span>-Partition aus, die "
"unter der <span class=\"guilabel\">Verschlüsselt</span>-Partition erscheint."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+#| "volume is now mounted as <span class=\"filename\">/media/amnesia/"
+#| "TailsData</span>."
msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
-"volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
+"volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
+"span>."
msgstr ""
"Klicken Sie auf <span class=\"guilabel\">Datenträger einhängen</span>. Der "
"alte beständige Speicherbereich ist nun unter <span class=\"filename\">/"
@@ -159,12 +194,20 @@ msgid "Copy your old files to the new persistent volume\n"
msgstr "Kopieren Sie Ihre alten Dateien in den neuen beständigen Speicherbereich\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
@@ -187,18 +230,27 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"In the file browser, navigate to <span class=\"filename\">/media/amnesia/TailsData</"
-"span> to open the old persistent volume."
+"In the file browser, navigate to <span class=\"filename\">/media/amnesia/"
+"TailsData</span> to open the old persistent volume."
msgstr ""
-"Navigieren Sie im Dateimanager zu <span class=\"filename\">/media/amnesia/TailsData</"
-"span>, um die alte beständige Speicherpartition zu öffnen."
+"Navigieren Sie im Dateimanager zu <span class=\"filename\">/media/amnesia/"
+"TailsData</span>, um die alte beständige Speicherpartition zu öffnen."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">New Tab</span>\n"
+#| " </span>\n"
+#| " and navigate to\n"
+#| " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| " this new tab.\n"
msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">File</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -218,13 +270,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
msgstr "Wählen Sie den <span class=\"guilabel\">TailsData</span>-Reiter aus."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
msgid ""
"To copy a folder containing persistent data from the old persistent volume "
"to the new one, drag and drop that folder from the <span class=\"guilabel"
"\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
msgstr ""
"Um einen Ordner, der beständig gespeicherte Daten enthält, vom alten "
"beständigen Speicherbereich in den neuen zu kopieren, ziehen Sie diesen "
@@ -235,6 +294,22 @@ msgstr ""
"aus. Kopieren Sie keinen Ordner von dem Sie nicht wissen, wofür er benutzt "
"wird."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" When copying a folder, select the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+" Then you might have to select again the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">apt</span> folder corresponds to the <span "
@@ -263,15 +338,6 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
-msgstr ""
-"Der <span class=\"filename\">icedove</span>-Ordner entspricht der Funktion "
-"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Icedove|"
-"configure#icedove]]</span>."
-
-#. type: Bullet: ' - '
-msgid ""
"The <span class=\"filename\">cups-configuration</span> folder corresponds to "
"the <span class=\"guilabel\">[[Printers|configure#printers]]</span> "
"persistence feature."
@@ -291,6 +357,21 @@ msgstr ""
"Konfigurationsdateien|configure#dotfiles]]</span>."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">openssh-client</span> folder corresponds to "
+#| "the <span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">electrum</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Bitcoin Client|configure#bitcoin]]</span> persistence "
+"feature."
+msgstr ""
+"Der <span class=\"filename\">openssh-client</span>-Ordner entspricht der "
+"<span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> Funktion "
+"des beständigen Speicherbereichs."
+
+#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">gnome-keyring</span> folder corresponds to the "
"<span class=\"guilabel\">[[GNOME Keyring|configure#gnome_keyring]]</span> "
@@ -311,6 +392,15 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
+"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+msgstr ""
+"Der <span class=\"filename\">icedove</span>-Ordner entspricht der Funktion "
+"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Icedove|"
+"configure#icedove]]</span>."
+
+#. type: Bullet: ' - '
+msgid ""
"The <span class=\"filename\">nm-connections</span> folder corresponds to the "
"<span class=\"guilabel\">[[Network Connections|"
"configure#network_connections]]</span> persistence feature."
diff --git a/wiki/src/doc/first_steps/persistence/copy.fa.po b/wiki/src/doc/first_steps/persistence/copy.fa.po
index 99d69b6..1f9c3d8 100644
--- a/wiki/src/doc/first_steps/persistence/copy.fa.po
+++ b/wiki/src/doc/first_steps/persistence/copy.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-11 21:42+0100\n"
+"POT-Creation-Date: 2016-02-04 16:01+0100\n"
"PO-Revision-Date: 2015-10-10 13:50+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -62,9 +62,13 @@ msgid ""
msgstr "ویژگی‌های مورد نظر مانای خود را دوباره روی دستگاه جدید فعال کنید."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
msgstr ""
"تیلز را دوباره راه‌اندازی و مانا را فعال کنید و [[یک گذرواژهٔ مدیریتی نیز "
"بسازید|startup_options/administration_password]]."
@@ -84,15 +88,23 @@ msgid "Plug in the old Tails device from which you want to rescue your data."
msgstr "دستگاه قدیمی تیلز که قصد بازیابی داده‌ها از رویش دارید را وصل کنید."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>\n"
+#| " to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span>\n"
" </span>\n"
-" to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
+" to open <span class=\"application\">GNOME Disks</span>.\n"
msgstr ""
"۱. این گزینه را انتخاب کنید\n"
" <span class=\"menuchoice\">\n"
@@ -111,8 +123,8 @@ msgstr "در سمت راست روی دستگاه مرتبط با تیلز قدی
#, fuzzy
msgid ""
"In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
msgstr ""
"در سمت چپ روی بخش موسوم به <span class=\"guilabel\">Encrypted</span> کلیک "
"کنید. <span class=\"guilabel\">نام پارتیشن</span> باید <span class=\"label"
@@ -121,9 +133,10 @@ msgstr ""
#. type: Bullet: '1. '
#, fuzzy
msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume. Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
msgstr ""
"روی <span class=\"guilabel\">آزاد کردن درایو</span> کلیک کنید تا درایو مانا "
"آزاد شود. گذرواژهٔ درایو مانای قدیمی را وارد کرده و روی <span class=\"guilabel"
@@ -133,7 +146,7 @@ msgstr ""
#, fuzzy
msgid ""
"Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
msgstr ""
"روی پارتیشن <span class=\"guilabel\">TailsData</span> که پایین <span class="
"\"guilabel\">Encrypted Volume</span> دیده می‌شود کلیک کنید."
@@ -144,7 +157,8 @@ msgstr ""
#| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
#| "volume is now mounted as <span class=\"filename\">/media/TailsData</span>."
msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
"volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
"span>."
msgstr ""
@@ -158,12 +172,20 @@ msgid "Copy your old files to the new persistent volume\n"
msgstr "کپی کردن فایل‌های قدیمی خود را درایو مانای جدید\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
@@ -197,11 +219,20 @@ msgstr ""
"درایو مانای قدیمی را باز کنید."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">New Tab</span>\n"
+#| " </span>\n"
+#| " and navigate to\n"
+#| " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| " this new tab.\n"
msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">File</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -222,13 +253,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
msgstr "روی زبانهٔ <span class=\"guilabel\">TailsData</span> کلیک کنید."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
msgid ""
"To copy a folder containing persistent data from the old persistent volume "
"to the new one, drag and drop that folder from the <span class=\"guilabel"
"\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
msgstr ""
"برای کپی کردن پوشه‌ٔ حاوی داده‌های مانا از درایو مانای قدیمی خود به مانای جدید، "
"آن پوشه را از <span class=\"guilabel\">TailsData</span> کشیده و در زبانهٔ "
@@ -237,6 +275,22 @@ msgstr ""
"\"guilabel\">جایگزین کردن همه</span> فایل‌ها را انتخاب کنید. اگر نمی‌دانید "
"کارکرد یک پوشه چیست، آن را کپی نکنید."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" When copying a folder, select the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+" Then you might have to select again the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">apt</span> folder corresponds to the <span "
@@ -262,19 +316,6 @@ msgstr ""
"\"guilabel\">[[نشانک‌های مرورگر|configure#browser_bookmarks]]</span> مانا است."
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "The <span class=\"filename\">dotfiles</span> folder corresponds to the "
-#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
-#| "persistence feature."
-msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
-msgstr ""
-"پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
-"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
-
-#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">cups-configuration</span> folder corresponds to "
"the <span class=\"guilabel\">[[Printers|configure#printers]]</span> "
@@ -293,6 +334,20 @@ msgstr ""
"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">openssh-client</span> folder corresponds to "
+#| "the <span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">electrum</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Bitcoin Client|configure#bitcoin]]</span> persistence "
+"feature."
+msgstr ""
+"پوشهٔ <span class=\"filename\">openssh-client</span> مرتبط با ویژگی <span "
+"class=\"guilabel\">[[کارخواه اس‌اس‌اچ|configure#ssh_client]]</span> مانا است."
+
+#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">gnome-keyring</span> folder corresponds to the "
"<span class=\"guilabel\">[[GNOME Keyring|configure#gnome_keyring]]</span> "
@@ -310,6 +365,19 @@ msgstr ""
"\"guilabel\">[[GnuPG|configure#gnupg]]</span> مانا است."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">dotfiles</span> folder corresponds to the "
+#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+msgstr ""
+"پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
+"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
+
+#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">nm-connections</span> folder corresponds to the "
"<span class=\"guilabel\">[[Network Connections|"
diff --git a/wiki/src/doc/first_steps/persistence/copy.fr.po b/wiki/src/doc/first_steps/persistence/copy.fr.po
index d3fddbb..830c1fe 100644
--- a/wiki/src/doc/first_steps/persistence/copy.fr.po
+++ b/wiki/src/doc/first_steps/persistence/copy.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-02-04 16:01+0100\n"
"PO-Revision-Date: 2015-10-20 02:03+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: <LL@li.org>\n"
@@ -65,9 +65,13 @@ msgstr ""
"nouveau volume persistant."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
msgstr ""
"Redémarrer Tails, activer la persistance, et [[définir un mot de passe "
"d'administration|startup_options/administration_password]]."
@@ -89,15 +93,23 @@ msgstr ""
"données."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>\n"
+#| " to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span>\n"
" </span>\n"
-" to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
+" to open <span class=\"application\">GNOME Disks</span>.\n"
msgstr ""
"1. Choisissez\n"
" <span class=\"menuchoice\">\n"
@@ -115,20 +127,31 @@ msgstr ""
"l'ancien périphérique Tails."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane, click on the partition labeled as <span class="
+#| "\"guilabel\">Encrypted</span>. The <span class=\"guilabel\">Partition "
+#| "Label</span> must be <span class=\"label\">TailsData</span>."
msgid ""
"In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
msgstr ""
"Dans le panneau de droite, cliquez sur la partition marquée comme <span "
"class=\"guilabel\">Chiffrée</span>. L' <span class=\"guilabel\">Étiquette de "
"la partition</span> doit être <span class=\"label\">TailsData</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
+#| "persistent volume. Enter the passphrase of the old persistent volume and "
+#| "click <span class=\"guilabel\">Unlock</span>."
msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume. Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
msgstr ""
"Cliquez sur <span class=\"guilabel\">Déverrouiller le volume</span> pour "
"ouvrir l'ancien volume persistant. Saisissez la phrase de passe de l'ancien "
@@ -136,22 +159,34 @@ msgstr ""
"span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on the <span class=\"guilabel\">TailsData</span> partition that "
+#| "appears below the <span class=\"guilabel\">Encrypted Volume</span> "
+#| "partition."
msgid ""
"Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
msgstr ""
"Cliquez maintenant sur la partition <span class=\"guilabel\">TailsData</"
"span> qui est apparu sous la partition intitulée <span class=\"guilabel"
"\">Chiffré</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+#| "volume is now mounted as <span class=\"filename\">/media/amnesia/"
+#| "TailsData</span>."
msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
-"volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
+"volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
+"span>."
msgstr ""
"Cliquez sur <span class=\"guilabel\">Monter le volume</span>. L'ancien "
-"volume persistant est maintenant monté sur <span class=\"filename\">/media/amnesia/"
-"TailsData</span>."
+"volume persistant est maintenant monté sur <span class=\"filename\">/media/"
+"amnesia/TailsData</span>."
#. type: Title -
#, no-wrap
@@ -159,12 +194,20 @@ msgid "Copy your old files to the new persistent volume\n"
msgstr "Copier vos anciens fichiers vers le nouveau volume persistant\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Root Terminal</span>\n"
+#| " </span>\n"
+#| " to open a terminal with administration rights.\n"
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Root Terminal</span>\n"
" </span>\n"
" to open a terminal with administration rights.\n"
@@ -187,18 +230,27 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"In the file browser, navigate to <span class=\"filename\">/media/amnesia/TailsData</"
-"span> to open the old persistent volume."
+"In the file browser, navigate to <span class=\"filename\">/media/amnesia/"
+"TailsData</span> to open the old persistent volume."
msgstr ""
"Dans le navigateur de fichier, naviguer jusqu'à <span class=\"filename\">/"
"media/TailsData</span> pour ouvrir l'ancien volume persistant."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">New Tab</span>\n"
+#| " </span>\n"
+#| " and navigate to\n"
+#| " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| " this new tab.\n"
msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">File</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -219,13 +271,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
msgstr "Cliquez sur l'onglet <span class=\"guilabel\">TailsData</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
msgid ""
"To copy a folder containing persistent data from the old persistent volume "
"to the new one, drag and drop that folder from the <span class=\"guilabel"
"\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
msgstr ""
"Pour copier un dossier contenant des données persistantes depuis l'ancien "
"volume persistant vers le nouveau, faites glisser puis déposez ce dossier "
@@ -235,6 +294,22 @@ msgstr ""
"dossier, et de <span class=\"guilabel\">Tout remplacer</span> pour les "
"fichiers. N'importez pas un dossier si vous ne savez pas à quoi il sert."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" When copying a folder, select the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+" Then you might have to select again the\n"
+" <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+" click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
#. type: Bullet: ' - '
msgid ""
"The <span class=\"filename\">apt</span> folder corresponds to the <span "
@@ -263,19 +338,6 @@ msgstr ""
"configure#browser_bookmarks]]</span>."