summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/chroot_local-hooks/19-install-tor-browser-AppArmor-profile48
-rw-r--r--config/chroot_local-includes/etc/asound.conf16
-rw-r--r--config/chroot_local-includes/etc/skel/.gnome2/accels/.placeholder0
-rw-r--r--config/chroot_local-includes/etc/skel/.gnome2_private/.placeholder0
-rw-r--r--config/chroot_local-includes/etc/skel/.purple/prefs.xml2
-rw-r--r--config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js2
-rw-r--r--config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop10
-rw-r--r--config/chroot_local-includes/etc/xdg/autostart/add-bookmark-for-persistent-directory.desktop10
-rw-r--r--config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop10
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory7
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks28
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/create-tor-browser-directories15
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh9
-rw-r--r--config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch124
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
-rw-r--r--features/images/DesktopTailsDocumentationIcon.pngbin0 -> 4676 bytes
-rw-r--r--features/images/GnomePlaces.pngbin0 -> 1055 bytes
-rw-r--r--features/images/GnomePlacesWithoutTorBrowserPersistent.pngbin0 -> 5558 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmark.pngbin0 -> 907 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmarkSelected.pngbin0 -> 2124 bytes
-rw-r--r--features/images/KeyImportedNotification.pngbin0 -> 3809 bytes
-rw-r--r--features/images/OpenWithImportKey.pngbin0 -> 2653 bytes
-rw-r--r--features/images/PidginTailsRoadmapUrl.pngbin0 -> 889 bytes
-rw-r--r--features/images/PrintToFile.png (renamed from features/images/EvincePrintToFile.png)bin1440 -> 1440 bytes
-rw-r--r--features/images/TailsOfflineDocHomepage.pngbin0 -> 4978 bytes
-rw-r--r--features/images/TorBrowserAmnesicFilesBookmark.pngbin0 -> 1920 bytes
-rw-r--r--features/images/TorBrowserBlockedVideo.pngbin0 -> 2814 bytes
-rw-r--r--features/images/TorBrowserCouldNotReadTheContentsOfWarning.pngbin0 -> 2724 bytes
-rw-r--r--features/images/TorBrowserHtml5PlayButton.pngbin0 -> 535 bytes
-rw-r--r--features/images/TorBrowserNoScriptTemporarilyAllowDialog.pngbin0 -> 1763 bytes
-rw-r--r--features/images/TorBrowserOkButton.pngbin0 -> 786 bytes
-rw-r--r--features/images/TorBrowserPersistentFilesBookmark.pngbin0 -> 2784 bytes
-rw-r--r--features/images/TorBrowserPrintDialog.pngbin0 -> 3517 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFile.pngbin0 -> 1254 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFileSelected.pngbin0 -> 1267 bytes
-rw-r--r--features/images/TorBrowserSampleRemoteHTML5VideoFrame.pngbin0 -> 110768 bytes
-rw-r--r--features/images/TorBrowserSampleRemoteWebMVideoFrame.pngbin0 -> 5185 bytes
-rw-r--r--features/images/TorBrowserSaveOutputFileSelected.pngbin0 -> 1563 bytes
-rw-r--r--features/images/TorBrowserSavedStartupPage.pngbin0 -> 2121 bytes
-rw-r--r--features/images/TorBrowserSynapticManual.pngbin0 -> 6018 bytes
-rw-r--r--features/images/TorBrowserTailsRoadmap.pngbin0 -> 2012 bytes
-rw-r--r--features/images/TorBrowserUnableToOpen.pngbin0 -> 1768 bytes
-rw-r--r--features/images/TorBrowserWarningDialogOkButton.pngbin0 -> 1304 bytes
-rw-r--r--features/pidgin.feature5
-rw-r--r--features/step_definitions/common_steps.rb170
-rw-r--r--features/step_definitions/evince.rb2
-rw-r--r--features/step_definitions/pidgin.rb8
-rw-r--r--features/support/helpers/sikuli_helper.rb4
-rw-r--r--features/support/helpers/vm_helper.rb6
-rw-r--r--features/torified_browsing.feature51
-rw-r--r--features/usb_install.feature19
-rw-r--r--wiki/src/about.de.po3
-rw-r--r--wiki/src/contribute/design/application_isolation.mdwn78
-rw-r--r--wiki/src/contribute/release_process/test.mdwn1
-rw-r--r--wiki/src/doc/about/features.fr.po29
-rw-r--r--wiki/src/doc/about/fingerprint.fr.po29
-rw-r--r--wiki/src/doc/about/openpgp_keys.fr.po20
-rw-r--r--wiki/src/doc/about/warning.de.po3
-rw-r--r--wiki/src/doc/about/warning.fr.po20
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po11
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po9
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fr.po20
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.mdwn36
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.fr.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.fr.po10
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po19
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.fr.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po7
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po8
-rw-r--r--wiki/src/download.fr.po14
-rw-r--r--wiki/src/inc/stable_i386_date.fr.po3
-rw-r--r--wiki/src/news.de.po3
-rw-r--r--wiki/src/news/version_1.3.mdwn16
-rw-r--r--wiki/src/news/who_are_you_helping.fr.po3
-rw-r--r--wiki/src/press.fr.po12
-rw-r--r--wiki/src/support/faq.fr.po18
-rw-r--r--wiki/src/support/talk.fr.po12
77 files changed, 707 insertions, 254 deletions
diff --git a/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
new file mode 100755
index 0000000..91fe2ab
--- /dev/null
+++ b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+set -e
+
+echo "Installing AppArmor profile for Tor Browser"
+
+PATCH='/usr/share/tails/torbrowser-AppArmor-profile.patch'
+PROFILE='/etc/apparmor.d/torbrowser'
+
+### Functions
+
+toggle_src_APT_sources() {
+ MODE="$1"
+ TEMP_APT_SOURCES='/etc/apt/sources.list.d/tmp-deb-src.list'
+
+ case "$MODE" in
+ on)
+ cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list \
+ | sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
+ > "$TEMP_APT_SOURCES"
+ ;;
+ off)
+ rm "$TEMP_APT_SOURCES"
+ ;;
+ esac
+
+ apt-get --yes update
+}
+
+install_torbrowser_AppArmor_profile() {
+ tmpdir="$(mktemp -d)"
+ (
+ cd "$tmpdir"
+ apt-get source torbrowser-launcher/testing
+ install -m 0644 \
+ torbrowser-launcher-*/apparmor/torbrowser.Browser.firefox \
+ "$PROFILE"
+ )
+ rm -r "$tmpdir"
+}
+
+### Main
+
+toggle_src_APT_sources on
+install_torbrowser_AppArmor_profile
+toggle_src_APT_sources off
+patch --forward --batch "$PROFILE" < "$PATCH"
+rm "$PATCH"
diff --git a/config/chroot_local-includes/etc/asound.conf b/config/chroot_local-includes/etc/asound.conf
new file mode 100644
index 0000000..d8eb4cf
--- /dev/null
+++ b/config/chroot_local-includes/etc/asound.conf
@@ -0,0 +1,16 @@
+# Use PulseAudio by default
+pcm.!default {
+ type pulse
+ fallback "sysdefault"
+ hint {
+ show on
+ description "Default ALSA Output (currently PulseAudio Sound Server)"
+ }
+}
+
+ctl.!default {
+ type pulse
+ fallback "sysdefault"
+}
+
+# vim:set ft=alsaconf:
diff --git a/config/chroot_local-includes/etc/skel/.gnome2/accels/.placeholder b/config/chroot_local-includes/etc/skel/.gnome2/accels/.placeholder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/chroot_local-includes/etc/skel/.gnome2/accels/.placeholder
diff --git a/config/chroot_local-includes/etc/skel/.gnome2_private/.placeholder b/config/chroot_local-includes/etc/skel/.gnome2_private/.placeholder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/chroot_local-includes/etc/skel/.gnome2_private/.placeholder
diff --git a/config/chroot_local-includes/etc/skel/.purple/prefs.xml b/config/chroot_local-includes/etc/skel/.purple/prefs.xml
index b268433..94fa8df 100644
--- a/config/chroot_local-includes/etc/skel/.purple/prefs.xml
+++ b/config/chroot_local-includes/etc/skel/.purple/prefs.xml
@@ -231,7 +231,7 @@
</pref>
<pref name='pidgin'>
<pref name='browsers'>
- <pref name='command' type='path' value='sensible-browser'/>
+ <pref name='manual_command' type='string' value='/usr/local/bin/tor-browser %s'/>
<pref name='browser' type='string' value='custom'/>
<pref name='place' type='int' value='0'/>
</pref>
diff --git a/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js b/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
index 2b64498..1a66eb5 100644
--- a/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
+++ b/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
@@ -59,6 +59,8 @@ pref("noscript.forbidPlugins", true);
pref("noscript.untrusted", "google-analytics.com");
// Other non-Torbutton, Tails-specific prefs
+pref("browser.download.dir", "/home/amnesia/Tor Browser");
+pref("browser.download.folderList", 2);
pref("browser.download.manager.closeWhenDone", true);
pref("extensions.update.enabled", false);
pref("layout.spellcheckDefault", 0);
diff --git a/config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop b/config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop
new file mode 100644
index 0000000..2e83c5b
--- /dev/null
+++ b/config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=add-GNOME-bookmarks
+GenericName=add GTK bookmarks to some directories
+Comment=display some directories in Places and GtkFileChooser
+Exec=/usr/local/lib/add-GNOME-bookmarks
+Terminal=false
+Type=Application
+Categories=GNOME;X-GNOME-PersonalSettings;
+NoDisplay=true
+MimeType=application/x-add-GNOME-bookmarks;
diff --git a/config/chroot_local-includes/etc/xdg/autostart/add-bookmark-for-persistent-directory.desktop b/config/chroot_local-includes/etc/xdg/autostart/add-bookmark-for-persistent-directory.desktop
deleted file mode 100644
index a185290..0000000
--- a/config/chroot_local-includes/etc/xdg/autostart/add-bookmark-for-persistent-directory.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=tails-add-bookmark-for-persistent-directory
-GenericName=add GTK bookmark to Persistent directory
-Comment=display Persistent directory in Places and GtkFileChooser
-Exec=/usr/local/bin/tails-add-bookmark-for-persistent-directory
-Terminal=false
-Type=Application
-Categories=GNOME;X-GNOME-PersonalSettings;
-NoDisplay=true
-MimeType=application/x-tails-add-bookmark-for-persistent-directory;
diff --git a/config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop b/config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop
new file mode 100644
index 0000000..349743e
--- /dev/null
+++ b/config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=create-tor-browser-directories
+GenericName=Create the Tor Browser directories
+Comment=Create the Tor Browser amnesiac and persistent directories
+Exec=/usr/local/lib/create-tor-browser-directories
+Terminal=false
+Type=Application
+Categories=GNOME;X-GNOME-PersonalSettings;
+NoDisplay=true
+MimeType=application/x-create-tor-browser-directories;
diff --git a/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory b/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory
deleted file mode 100755
index c652f76..0000000
--- a/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-PERSISTENT_DIRECTORY="${HOME}/Persistent"
-
-if mountpoint -q "$PERSISTENT_DIRECTORY" 2>/dev/null ; then
- echo "file://$PERSISTENT_DIRECTORY" >> "${HOME}/.gtk-bookmarks"
-fi
diff --git a/config/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks b/config/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks
new file mode 100755
index 0000000..77bf41f
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -eu
+
+. /usr/local/lib/tails-shell-library/tails-greeter.sh
+
+add_gtk_bookmark_for() {
+ local target
+ target=$(echo "$1" | sed 's, ,%20,g')
+
+ if [ $# -ge 2 ]; then
+ title="$2"
+ echo "file://$target $title" >> "${HOME}/.gtk-bookmarks"
+ else
+ echo "file://$target" >> "${HOME}/.gtk-bookmarks"
+ fi
+}
+
+add_gtk_bookmark_for "${HOME}/Tor Browser"
+
+if persistence_is_enabled_for "${HOME}/Persistent" ; then
+ add_gtk_bookmark_for "${HOME}/Persistent"
+
+ if persistence_is_enabled_read_write ; then
+ add_gtk_bookmark_for "${HOME}/Persistent/Tor Browser" \
+ "Tor Browser (persistent)"
+ fi
+fi
diff --git a/config/chroot_local-includes/usr/local/lib/create-tor-browser-directories b/config/chroot_local-includes/usr/local/lib/create-tor-browser-directories
new file mode 100755
index 0000000..e1fe2c3
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/lib/create-tor-browser-directories
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -eu
+
+TOR_BROWSER_AMNESIAC_DIR='/home/amnesia/Tor Browser'
+TOR_BROWSER_PERSISTENT_DIR='/home/amnesia/Persistent/Tor Browser'
+
+. /usr/local/lib/tails-shell-library/tails-greeter.sh
+
+install -d -o amnesia -g amnesia -m 0700 "$TOR_BROWSER_AMNESIAC_DIR"
+
+if persistence_is_enabled_for "${HOME}/Persistent" && \
+ persistence_is_enabled_read_write ; then
+ install -d -o amnesia -g amnesia -m 0700 "$TOR_BROWSER_PERSISTENT_DIR"
+fi
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh
index 31e25d3..9c301f1 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh
@@ -14,6 +14,15 @@ persistence_is_enabled() {
[ "$(_get_tg_setting "${PERSISTENCE_STATE}" TAILS_PERSISTENCE_ENABLED)" = true ]
}
+persistence_is_enabled_for() {
+ persistence_is_enabled && mountpoint -q "$1" 2>/dev/null
+}
+
+persistence_is_enabled_read_write() {
+ persistence_is_enabled && \
+ [ "$(_get_tg_setting "${PERSISTENCE_STATE}" TAILS_PERSISTENCE_READONLY)" != true ]
+}
+
mac_spoof_is_enabled() {
# Only return false when explicitly told so to increase failure
# safety.
diff --git a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
new file mode 100644
index 0000000..d6f8bf6
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
@@ -0,0 +1,124 @@
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index 0df7ad9..ae26e61 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -1,13 +1,15 @@
+ # Last modified
+ #include <tunables/global>
+
+-/home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox {
++/usr/local/lib/tor-browser/firefox {
+ #include <abstractions/gnome>
++ #include <abstractions/gstreamer>
++ #include <abstractions/ibus>
+
+ # Uncomment the following line if you don't want the Tor Browser
+ # to have direct access to your sound hardware. Note that this is not
+ # enough to have working sound support in Tor Browser.
+- # #include <abstractions/audio>
++ #include <abstractions/audio>
+
+ # Uncomment the following lines if you want to give the Tor Browser read-write
+ # access to most of your personal files.
+@@ -17,40 +19,52 @@
+ #dbus,
+ network tcp,
+
++ /etc/asound.conf r,
+ deny /etc/host.conf r,
+- deny /etc/hosts r,
+- deny /etc/nsswitch.conf r,
++ /etc/hosts r,
++ /etc/nsswitch.conf r,
+ deny /etc/resolv.conf r,
+- deny /etc/passwd r,
+- deny /etc/group r,
++ /etc/passwd r,
++ /etc/group r,
+ deny /etc/mailcap r,
++ deny @{HOME}/.local/share/gvfs-metadata/home r,
++ deny /run/resolvconf/resolv.conf r,
+
+- deny /etc/machine-id r,
+- deny /var/lib/dbus/machine-id r,
++ /etc/machine-id r,
++ /var/lib/dbus/machine-id r,
+
+ @{PROC}/[0-9]*/mountinfo r,
+ @{PROC}/[0-9]*/stat r,
+ @{PROC}/[0-9]*/task/*/stat r,
+ @{PROC}/sys/kernel/random/uuid r,
+
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/ r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/* r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/.** rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/.** rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/ r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/** r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/*.so mr,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/components/*.so mr,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/browser/components/*.so mr,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox rix,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profiles.ini r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profile.default/ r,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profile.default/** rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Tor/tor Px,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Desktop/ rw,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Desktop/** rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Downloads/ rw,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Downloads/** rwk,
++ /usr/local/lib/tor-browser/ r,
++ /usr/local/lib/tor-browser/** r,
++ /usr/local/lib/tor-browser/*.so{,.6} mr,
++ /usr/local/lib/tor-browser/**/*.so mr,
++ /usr/local/lib/tor-browser/browser/* r,
++ /usr/local/lib/tor-browser/TorBrowser/Data/Browser/profiles.ini r,
++
++ owner "@{HOME}/Tor Browser/" rw,
++ owner "@{HOME}/Tor Browser/**" rwk,
++ owner "@{HOME}/Persistent/Tor Browser/" rw,
++ owner "@{HOME}/Persistent/Tor Browser/**" rwk,
++ owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser/" rw,
++ owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser/**" rwk,
++ owner @{HOME}/.mozilla/firefox/bookmarks/places.sqlite rwk,
++ owner /live/persistence/TailsData_unlocked/bookmarks/places.sqlite rwk,
++ owner @{HOME}/.tor-browser/profile.default/ r,
++ owner @{HOME}/.tor-browser/profile.default/** rwk,
++
++ /etc/xul-ext/ r,
++ /etc/xul-ext/** r,
++ /usr/local/share/tor-browser-extensions/ r,
++ /usr/local/share/tor-browser-extensions/** rk,
++ /usr/share/xul-ext/ r,
++ /usr/share/xul-ext/** r,
++
++ /usr/share/doc/tails/website/ r,
++ /usr/share/doc/tails/website/** r,
+
+ /etc/mailcap r,
+ /etc/mime.types r,
+@@ -65,6 +79,7 @@
+
+ /sys/devices/system/cpu/ r,
+ /sys/devices/system/cpu/present r,
++ deny /sys/devices/virtual/block/*/uevent r,
+
+ # Should use abstractions/gstreamer instead once merged upstream
+ /etc/udev/udev.conf r,
+@@ -72,6 +87,16 @@
+ /sys/devices/pci[0-9]*/**/uevent r,
+ owner /{dev,run}/shm/shmfd-* rw,
+
++ /usr/lib/@{multiarch}/gstreamer[0-9]*.[0-9]*/gstreamer-[0-9]*.[0-9]*/gst-plugin-scanner Cix -> gst_plugin_scanner,
++ owner @{HOME}/.gstreamer*/ rw,
++ owner @{HOME}/.gstreamer*/** rw,
++ owner @{PROC}/[0-9]*/fd/ r,
++
++ deny /usr/bin/pulseaudio x,
++
++ /usr/local/lib/tor-browser/firefox Pix,
++ /usr/bin/seahorse-tool Ux,
++
+ # KDE 4
+ owner @{HOME}/.kde/share/config/* r,
+
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index ce0df79..8e4cfd5 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -203,6 +203,7 @@ plymouth
poedit
ppp
pulseaudio
+pulseaudio-utils
pwgen
p7zip-full
resolvconf
diff --git a/features/images/DesktopTailsDocumentationIcon.png b/features/images/DesktopTailsDocumentationIcon.png
new file mode 100644
index 0000000..5128b60
--- /dev/null
+++ b/features/images/DesktopTailsDocumentationIcon.png
Binary files differ
diff --git a/features/images/GnomePlaces.png b/features/images/GnomePlaces.png
new file mode 100644
index 0000000..98036cc
--- /dev/null
+++ b/features/images/GnomePlaces.png
Binary files differ
diff --git a/features/images/GnomePlacesWithoutTorBrowserPersistent.png b/features/images/GnomePlacesWithoutTorBrowserPersistent.png
new file mode 100644
index 0000000..710cb5d
--- /dev/null
+++ b/features/images/GnomePlacesWithoutTorBrowserPersistent.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmark.png b/features/images/GtkTorBrowserPersistentBookmark.png
new file mode 100644
index 0000000..aa6e936
--- /dev/null
+++ b/features/images/GtkTorBrowserPersistentBookmark.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmarkSelected.png b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
new file mode 100644
index 0000000..f084ba7
--- /dev/null
+++ b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
Binary files differ
diff --git a/features/images/KeyImportedNotification.png b/features/images/KeyImportedNotification.png
new file mode 100644
index 0000000..f3e0718
--- /dev/null
+++ b/features/images/KeyImportedNotification.png
Binary files differ
diff --git a/features/images/OpenWithImportKey.png b/features/images/OpenWithImportKey.png
new file mode 100644
index 0000000..5cca550
--- /dev/null
+++ b/features/images/OpenWithImportKey.png
Binary files differ
diff --git a/features/images/PidginTailsRoadmapUrl.png b/features/images/PidginTailsRoadmapUrl.png
new file mode 100644
index 0000000..98ece01
--- /dev/null
+++ b/features/images/PidginTailsRoadmapUrl.png
Binary files differ
diff --git a/features/images/EvincePrintToFile.png b/features/images/PrintToFile.png
index 2175d01..2175d01 100644
--- a/features/images/EvincePrintToFile.png
+++ b/features/images/PrintToFile.png
Binary files differ
diff --git a/features/images/TailsOfflineDocHomepage.png b/features/images/TailsOfflineDocHomepage.png
new file mode 100644
index 0000000..95d5ea6
--- /dev/null
+++ b/features/images/TailsOfflineDocHomepage.png
Binary files differ
diff --git a/features/images/TorBrowserAmnesicFilesBookmark.png b/features/images/TorBrowserAmnesicFilesBookmark.png
new file mode 100644
index 0000000..c256450
--- /dev/null
+++ b/features/images/TorBrowserAmnesicFilesBookmark.png
Binary files differ
diff --git a/features/images/TorBrowserBlockedVideo.png b/features/images/TorBrowserBlockedVideo.png
new file mode 100644
index 0000000..a4916cc
--- /dev/null
+++ b/features/images/TorBrowserBlockedVideo.png
Binary files differ
diff --git a/features/images/TorBrowserCouldNotReadTheContentsOfWarning.png b/features/images/TorBrowserCouldNotReadTheContentsOfWarning.png
new file mode 100644
index 0000000..20beef8
--- /dev/null
+++ b/features/images/TorBrowserCouldNotReadTheContentsOfWarning.png
Binary files differ
diff --git a/features/images/TorBrowserHtml5PlayButton.png b/features/images/TorBrowserHtml5PlayButton.png
new file mode 100644
index 0000000..11d0eaf
--- /dev/null
+++ b/features/images/TorBrowserHtml5PlayButton.png
Binary files differ
diff --git a/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
new file mode 100644
index 0000000..45b60bf
--- /dev/null
+++ b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
Binary files differ
diff --git a/features/images/TorBrowserOkButton.png b/features/images/TorBrowserOkButton.png
new file mode 100644
index 0000000..662d90f
--- /dev/null
+++ b/features/images/TorBrowserOkButton.png
Binary files differ
diff --git a/features/images/TorBrowserPersistentFilesBookmark.png b/features/images/TorBrowserPersistentFilesBookmark.png
new file mode 100644
index 0000000..47dea26
--- /dev/null
+++ b/features/images/TorBrowserPersistentFilesBookmark.png
Binary files differ
diff --git a/features/images/TorBrowserPrintDialog.png b/features/images/TorBrowserPrintDialog.png
new file mode 100644
index 0000000..77404f3
--- /dev/null
+++ b/features/images/TorBrowserPrintDialog.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFile.png b/features/images/TorBrowserPrintOutputFile.png
new file mode 100644
index 0000000..e940ad9
--- /dev/null
+++ b/features/images/TorBrowserPrintOutputFile.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFileSelected.png b/features/images/TorBrowserPrintOutputFileSelected.png
new file mode 100644
index 0000000..dc625ad
--- /dev/null
+++ b/features/images/TorBrowserPrintOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSampleRemoteHTML5VideoFrame.png b/features/images/TorBrowserSampleRemoteHTML5VideoFrame.png
new file mode 100644
index 0000000..2ba8ae7
--- /dev/null
+++ b/features/images/TorBrowserSampleRemoteHTML5VideoFrame.png
Binary files differ
diff --git a/features/images/TorBrowserSampleRemoteWebMVideoFrame.png b/features/images/TorBrowserSampleRemoteWebMVideoFrame.png
new file mode 100644
index 0000000..36e7301
--- /dev/null
+++ b/features/images/TorBrowserSampleRemoteWebMVideoFrame.png
Binary files differ
diff --git a/features/images/TorBrowserSaveOutputFileSelected.png b/features/images/TorBrowserSaveOutputFileSelected.png
new file mode 100644
index 0000000..8addb17
--- /dev/null
+++ b/features/images/TorBrowserSaveOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSavedStartupPage.png b/features/images/TorBrowserSavedStartupPage.png
new file mode 100644
index 0000000..17cbd88
--- /dev/null
+++ b/features/images/TorBrowserSavedStartupPage.png
Binary files differ
diff --git a/features/images/TorBrowserSynapticManual.png b/features/images/TorBrowserSynapticManual.png
new file mode 100644
index 0000000..f8ffa3e
--- /dev/null
+++ b/features/images/TorBrowserSynapticManual.png
Binary files differ
diff --git a/features/images/TorBrowserTailsRoadmap.png b/features/images/TorBrowserTailsRoadmap.png
new file mode 100644
index 0000000..80d8976
--- /dev/null
+++ b/features/images/TorBrowserTailsRoadmap.png
Binary files differ
diff --git a/features/images/TorBrowserUnableToOpen.png b/features/images/TorBrowserUnableToOpen.png
new file mode 100644
index 0000000..8534ff3
--- /dev/null
+++ b/features/images/TorBrowserUnableToOpen.png
Binary files differ
diff --git a/features/images/TorBrowserWarningDialogOkButton.png b/features/images/TorBrowserWarningDialogOkButton.png
new file mode 100644
index 0000000..59c0102
--- /dev/null
+++ b/features/images/TorBrowserWarningDialogOkButton.png
Binary files differ
diff --git a/features/pidgin.feature b/features/pidgin.feature
index 51d4a77..67d7d75 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -21,6 +21,11 @@ Feature: Chatting anonymously using Pidgin
And I close Pidgin's account manager window
Then Pidgin successfully connects to the "irc.oftc.net" account
And I can join the "#tails" channel on "irc.oftc.net"
+ When I type "/topic"
+ And I press the "ENTER" key
+ Then I see the Tails roadmap URL
+ When I click on the Tails roadmap URL
+ Then the Tor Browser has started and loaded the Tails roadmap
And all Internet traffic has only flowed through Tor
Scenario: Adding a certificate to Pidgin
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 4e43935..364b884 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -331,10 +331,18 @@ Given /^the Tor Browser has started$/ do
@screen.wait(tor_browser_picture, 60)
end
-Given /^the Tor Browser has started and loaded the startup page$/ do
+Given /^the Tor Browser has started and loaded the (startup page|Tails roadmap)$/ do |page|
next if @skip_steps_while_restoring_background
+ case page
+ when "startup page"
+ picture = "TorBrowserStartupPage.png"
+ when "Tails roadmap"
+ picture = "TorBrowserTailsRoadmap.png"
+ else
+ raise "Unsupported page: #{page}"
+ end
step "the Tor Browser has started"
- @screen.wait("TorBrowserStartupPage.png", 120)
+ @screen.wait(picture, 120)
end
Given /^the Tor Browser has started in offline mode$/ do
@@ -720,9 +728,30 @@ When /^I run "([^"]+)" in GNOME Terminal$/ do |command|
@screen.type(command + Sikuli::Key.ENTER)
end
-When /^the file "([^"]+)" exists$/ do |file|
+When /^the file "([^"]+)" exists(?:| after at most (\d+) seconds)$/ do |file, timeout|
+ next if @skip_steps_while_restoring_background
+ timeout = 0 if timeout.nil?
+ try_for(
+ timeout.to_i,
+ :msg => "The file #{file} does not exist after #{timeout} seconds"
+ ) {
+ @vm.file_exist?(file)
+ }
+end
+
+When /^the file "([^"]+)" does not exist$/ do |file|
+ next if @skip_steps_while_restoring_background
+ assert(! (@vm.file_exist?(file)))
+end
+
+When /^the directory "([^"]+)" exists$/ do |directory|
next if @skip_steps_while_restoring_background
- assert(@vm.file_exist?(file))
+ assert(@vm.directory_exist?(directory))
+end
+
+When /^the directory "([^"]+)" does not exist$/ do |directory|
+ next if @skip_steps_while_restoring_background
+ assert(! (@vm.directory_exist?(directory)))
end
When /^I copy "([^"]+)" to "([^"]+)" as user "([^"]+)"$/ do |source, destination, user|
@@ -772,3 +801,136 @@ Given /^I start "([^"]+)" via the GNOME "([^"]+)"\/"([^"]+)" applications menu$/
@screen.wait_and_hover(prefix + "Applications" + subsubmenu + ".png", 20)
@screen.wait_and_click(prefix + "Applications" + app + ".png", 20)
end
+
+When /^I type "([^"]+)"$/ do |string|
+ next if @skip_steps_while_restoring_background
+ @screen.type(string)
+end
+
+When /^I press the "([^"]+)" key$/ do |key|
+ next if @skip_steps_while_restoring_background
+ case key
+ when "ENTER"
+ @screen.type(Sikuli::Key.ENTER)
+ else
+ raise "unsupported key #{key}"
+ end
+end
+
+Then /^the (amnesiac|persistent) Tor Browser directory (exists|does not exist)$/ do |persistent_or_not, mode|
+ next if @skip_steps_while_restoring_background
+ case persistent_or_not
+ when "amnesiac"
+ dir = '/home/amnesia/Tor Browser'
+ when "persistent"
+ dir = '/home/amnesia/Persistent/Tor Browser'
+ end
+ step "the directory \"#{dir}\" #{mode}"
+end
+
+Then /^there is a GNOME bookmark for the (amnesiac|persistent) Tor Browser directory$/ do |persistent_or_not|
+ next if @skip_steps_while_restoring_background
+ case persistent_or_not
+ when "amnesiac"
+ bookmark_image = 'TorBrowserAmnesicFilesBookmark.png'
+ when "persistent"
+ bookmark_image = 'TorBrowserPersistentFilesBookmark.png'
+ end
+ @screen.wait_and_click('GnomePlaces.png', 10)
+ @screen.wait(bookmark_image, 40)
+ @screen.type(Sikuli::Key.ESC)
+end
+
+Then /^there is no GNOME bookmark for the persistent Tor Browser directory$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_click('GnomePlaces.png', 10)
+ @screen.wait("GnomePlacesWithoutTorBrowserPersistent.png", 40)
+ @screen.type(Sikuli::Key.ESC)
+end
+
+def pulseaudio_sink_inputs
+ pa_info = @vm.execute_successfully('pacmd info', $live_user).stdout
+ sink_inputs_line = pa_info.match(/^\d+ sink input\(s\) available\.$/)[0]
+ return sink_inputs_line.match(/^\d+/)[0].to_i
+end
+
+When /^(no|\d+) application(?:s?) (?:is|are) playing audio(?:| after (\d+) seconds)$/ do |nb, wait_time|
+ next if @skip_steps_while_restoring_background
+ nb = 0 if nb == "no"
+ sleep wait_time.to_i if ! wait_time.nil?
+ assert_equal(nb.to_i, pulseaudio_sink_inputs)
+end
+
+When /^I double-click on the "Tails documentation" link on the Desktop$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_double_click("DesktopTailsDocumentationIcon.png", 10)
+end
+
+When /^I click the blocked video icon$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_click("TorBrowserBlockedVideo.png", 30)
+end
+
+When /^I accept to temporarily allow playing this video$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_click("TorBrowserOkButton.png", 10)
+end
+
+When /^I click the HTML5 play button$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_click("TorBrowserHtml5PlayButton.png", 30)
+end
+
+When /^I can save the current page as "([^"]+[.]html)" to the (default downloads|persistent Tor Browser) directory$/ do |output_file, output_dir|
+ next if @skip_steps_while_restoring_background
+ @screen.type("s", Sikuli::KeyModifier.CTRL)
+ if output_dir == "persistent Tor Browser"
+ output_dir = "/home/amnesia/Persistent/Tor Browser"
+ @screen.wait_and_click("GtkTorBrowserPersistentBookmark.png", 10)
+ @screen.wait("GtkTorBrowserPersistentBookmarkSelected.png", 10)
+ # The output filename (without its extension) is already selected,
+ # let's use the keyboard shortcut to focus its field
+ @screen.type("n", Sikuli::KeyModifier.ALT)
+ @screen.wait("TorBrowserSaveOutputFileSelected.png", 10)
+ else
+ output_dir = "/home/amnesia/Tor Browser"
+ end
+ # Only the part of the filename before the .html extension can be easily replaced
+ # so we have to remove it before typing it into the arget filename entry widget.
+ @screen.type(output_file.sub(/[.]html$/, ''))
+ @screen.type(Sikuli::Key.ENTER)
+ try_for(10, :msg => "The page was not saved to #{output_dir}/#{output_file}") {
+ @vm.file_exist?("#{output_dir}/#{output_file}")
+ }
+end
+
+When /^I can print the current page as "([^"]+[.]pdf)" to the (default downloads|persistent Tor Browser) directory$/ do |output_file, output_dir|
+ next if @skip_steps_while_restoring_background
+ if output_dir == "persistent Tor Browser"
+ output_dir = "/home/amnesia/Persistent/Tor Browser"
+ else
+ output_dir = "/home/amnesia/Tor Browser"
+ end
+ @screen.type("p", Sikuli::KeyModifier.CTRL)
+ @screen.wait("TorBrowserPrintDialog.png", 10)
+ @screen.wait_and_click("PrintToFile.png", 10)
+ # Tor Browser is not allowed to read /home/amnesia, and I found no way
+ # to change the default destination directory for "Print to File",
+ # so let's click through the warning
+ @screen.wait("TorBrowserCouldNotReadTheContentsOfWarning.png", 10)
+ @screen.wait_and_click("TorBrowserWarningDialogOkButton.png", 10)
+ @screen.wait_and_double_click("TorBrowserPrintOutputFile.png", 10)
+ @screen.hide_cursor
+ @screen.wait("TorBrowserPrintOutputFileSelected.png", 10)
+ # Only the file's basename is selected by double-clicking,
+ # so we type only the desired file's basename to replace it
+ @screen.type(output_dir + '/' + output_file.sub(/[.]pdf$/, '') + Sikuli::Key.ENTER)
+ try_for(30, :msg => "The page was not printed to #{output_dir}/#{output_file}") {
+ @vm.file_exist?("#{output_dir}/#{output_file}")
+ }
+end
+
+When /^I accept to import the key with Seahorse$/ do
+ next if @skip_steps_while_restoring_background
+ @screen.wait_and_click("TorBrowserOkButton.png", 10)
+end
diff --git a/features/step_definitions/evince.rb b/features/step_definitions/evince.rb
index d9bb42c..1bb122d 100644
--- a/features/step_definitions/evince.rb
+++ b/features/step_definitions/evince.rb
@@ -7,7 +7,7 @@ Then /^I can print the current document to "([^"]+)"$/ do |output_file|
next if @skip_steps_while_restoring_background
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("EvincePrintDialog.png", 10)
- @screen.wait_and_click("EvincePrintToFile.png", 10)
+ @screen.wait_and_click("PrintToFile.png", 10)
@screen.wait_and_double_click("EvincePrintOutputFile.png", 10)
@screen.hide_cursor
@screen.wait("EvincePrintOutputFileSelected.png", 10)
diff --git a/features/step_definitions/pidgin.rb b/features/step_definitions/pidgin.rb
index 5e673e3..2571e40 100644
--- a/features/step_definitions/pidgin.rb
+++ b/features/step_definitions/pidgin.rb
@@ -192,3 +192,11 @@ When /^I close Pidgin's certificate import failure dialog$/ do
# @screen.wait_and_click('PidginCertificateManagerClose.png', 10)
@screen.waitVanish('PidginCertificateImportFailed.png', 10)
end
+
+When /^I see the Tails roadmap URL$/ do
+ @screen.wait('PidginTailsRoadmapUrl.png', 10)
+end
+
+When /^I click on the Tails roadmap URL$/ do
+ @screen.click('PidginTailsRoadmapUrl.png')
+end
diff --git a/features/support/helpers/sikuli_helper.rb b/features/support/helpers/sikuli_helper.rb
index 4e8b784..e132c38 100644
--- a/features/support/helpers/sikuli_helper.rb
+++ b/features/support/helpers/sikuli_helper.rb
@@ -112,6 +112,10 @@ def sikuli_script_proxy.new(*args)
self.doubleClick(self.wait(pic, time))
end
+ def s.wait_and_right_click(pic, time)
+ self.rightClick(self.wait(pic, time))
+ end
+
def s.wait_and_hover(pic, time)
self.hover(self.wait(pic, time))
end
diff --git a/features/support/helpers/vm_helper.rb b/features/support/helpers/vm_helper.rb
index e82737a..97baabc 100644
--- a/features/support/helpers/vm_helper.rb
+++ b/features/support/helpers/vm_helper.rb
@@ -369,7 +369,11 @@ EOF
end
def file_exist?(file)
- execute("test -e #{file}").success?
+ execute("test -e '#{file}'").success?
+ end
+
+ def directory_exist?(directory)
+ execute("test -d '#{directory}'").success?
end
def file_content(file, user = 'root')
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index fcf4219..b09e60b 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -16,6 +16,57 @@ Feature: Browsing the web using the Tor Browser
And all notifications have disappeared
And I save the state so the background can be restored next scenario
+ Scenario: The Tor Browser directory is usable
+ When I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ Then the amnesiac Tor Browser directory exists
+ And there is a GNOME bookmark for the amnesiac Tor Browser directory
+ And the persistent Tor Browser directory does not exist
+ And I can save the current page as "index.html" to the default downloads directory
+ And I can print the current page as "output.pdf" to the default downloads directory
+
+ Scenario: Importing an OpenPGP key from a website
+ When I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ And I open the address "https://tails.boum.org/tails-signing.key" in the Tor Browser
+ Then I see "OpenWithImportKey.png" after at most 20 seconds
+ When I accept to import the key with Seahorse
+ Then I see "KeyImportedNotification.png" after at most 10 seconds
+
+ Scenario: Playing HTML5 audio
+ When I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ And no application is playing audio
+ And I open the address "http://www.terrillthompson.com/tests/html5-audio.html" in the Tor Browser
+ And I click the HTML5 play button
+ And 1 application is playing audio after 10 seconds
+ And all Internet traffic has only flowed through Tor
+
+ Scenario: Watching a WebM video
+ When I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ And I open the address "https://webm.html5.org/test.webm" in the Tor Browser
+ And I click the blocked video icon
+ And I see "TorBrowserNoScriptTemporarilyAllowDialog.png" after at most 10 seconds
+ And I accept to temporarily allow playing this video
+ Then I see "TorBrowserSampleRemoteWebMVideoFrame.png" after at most 180 seconds
+ And all Internet traffic has only flowed through Tor
+
+ Scenario: I can view a file stored in "~/Tor Browser" but not in ~/.gnupg
+ Given I copy "/usr/share/synaptic/html/index.html" to "/home/amnesia/Tor Browser/synaptic.html" as user "amnesia"
+ And I copy "/usr/share/synaptic/html/index.html" to "/home/amnesia/.gnupg/synaptic.html" as user "amnesia"
+ And I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ When I open the address "file:///home/amnesia/Tor Browser/synaptic.html" in the Tor Browser
+ Then I see "TorBrowserSynapticManual.png" after at most 10 seconds
+ When I open the address "file:///home/amnesia/.gnupg/synaptic.html" in the Tor Browser
+ Then I see "TorBrowserUnableToOpen.png" after at most 10 seconds
+
+ Scenario: The "Tails documentation" link on the Desktop works
+ When I double-click on the "Tails documentation" link on the Desktop
+ Then the Tor Browser has started
+ And I see "TailsOfflineDocHomepage.png" after at most 10 seconds
+
Scenario: The Tor Browser uses TBB's shared libraries
When I start the Tor Browser
And the Tor Browser has started
diff --git a/features/usb_install.feature b/features/usb_install.feature
index e01362d..28a18a7 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -34,6 +34,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And Tails is running from USB drive "current"
And the boot device has safe access rights
And there is no persistence partition on USB drive "current"
+ And the persistent Tor Browser directory does not exist
And I create a persistent partition with password "asdf"
Then a Tails persistence partition with password "asdf" exists on USB drive "current"
And I shutdown Tails and wait for the computer to power off
@@ -48,6 +49,23 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
But a Tails persistence partition with password "asdf" exists on USB drive "current"
@keep_volumes
+ Scenario: The persistent Tor Browser directory is usable
+ Given a computer
+ And I start Tails from USB drive "current" and I login with persistence password "asdf"
+ And Tails is running from USB drive "current"
+ And Tor is ready
+ And available upgrades have been checked
+ And all notifications have disappeared
+ Then the persistent Tor Browser directory exists
+ And there is a GNOME bookmark for the persistent Tor Browser directory
+ When I start the Tor Browser
+ And the Tor Browser has started and loaded the startup page
+ And I can save the current page as "index.html" to the persistent Tor Browser directory
+ When I open the address "file:///home/amnesia/Persistent/Tor Browser/index.html" in the Tor Browser
+ Then I see "TorBrowserSavedStartupPage.png" after at most 10 seconds
+ And I can print the current page as "output.pdf" to the persistent Tor Browser directory
+
+ @keep_volumes
Scenario: Persistent browser bookmarks
Given a computer
And the computer is set to boot from USB drive "current"
@@ -98,6 +116,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then Tails is running from USB drive "current"
And the boot device has safe access rights
And all persistence presets are enabled
+ And there is no GNOME bookmark for the persistent Tor Browser directory
And I write some files not expected to persist
And I remove some files expected to persist
And I take note of which persistence presets are available
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index 0fd3664..e8bb636 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-28 14:12+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-28 14:19+0100\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/contribute/design/application_isolation.mdwn b/wiki/src/contribute/design/application_isolation.mdwn
index c9050d3..8595da0 100644
--- a/wiki/src/contribute/design/application_isolation.mdwn
+++ b/wiki/src/contribute/design/application_isolation.mdwn
@@ -37,7 +37,10 @@ The AppArmor confinement profiles included in Tails come from:
* individual Debian packages that ship confinement profiles, e.g.
Tor and Vidalia;
* the [[!debpts apparmor-profiles]] package;
-* the [[!debpts apparmor-profiles-extra]] package.
+* the [[!debpts apparmor-profiles-extra]] package;
+* the [[!debpts torbrowser-launcher]] package:
+ - [[!tails_gitweb config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch]]
+ - [[!tails_gitweb config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile]]
To get the full and current list, run `aa-status` as `root`
inside Tails.
@@ -65,6 +68,79 @@ that are actually seen by AppArmor in the context of Tails:
Below, we discuss various leads that might avoid the need for coming
up with such adjustments, and maintaining it.
+<a id="ux"></a>
+
+User experience matters
+=======================
+
+Currently, no good way exists to let the user choose an arbitrary file
+each time they want to open or save one, without leaving the AppArmor
+profiles wide-open and then much less useful.
+
+Solutions to this problem are work-in-progress in various upstream
+places (e.g. AppArmor and GNOME sandboxed applications). The idea is
+generally to introduce a privileged mediation layer between
+applications, the GTK file chooser and the filesystem. So, some day we
+can solve this problem in better ways, but we're not there yet.
+
+Tor Browser
+-----------
+
+As of Tails 1.3, the Tor Browser is somewhat confined with AppArmor.
+
+Given we cannot seriously allow the Tor Browser to read and write
+everywhere in the home and persistent directory, we had to allow it to
+read/write files from/to one specific directory, and make it so the
+user experience is not hurt too much.
+
+Now, let's say we have a downloads/uploads directory that's shared
+between the Tor Browser, the file browser, and all non-confined
+applications. That directory is called `~/Tor Browser/`, and a GTK
+bookmark pointing to it is created at login time:
+
+* [[!tails_gitweb config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop]]
+* [[!tails_gitweb config/chroot_local-includes/usr/local/lib/create-tor-browser-directories]]
+* [[!tails_gitweb config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop]]
+* [[!tails_gitweb config/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks]]
+
+Then, we have a usability issue: the space available in that directory
+is limited by the free system memory (RAM). So large file downloads
+may fail. Note that Firefox doesn't mind letting users start
+downloading a file to a directory that hasn't enough room available to
+store it entirely, so this problem is not specific to downloading to
+an amnesiac directory.
+
+Still, we thought it would be good to allow users to download large
+files from Tor Browser to their persistent volume, so we have
+introduced a second downloads/uploads directory: `~/Persistent/Tor
+Browser/`, that is created whenever the "Personal data" (aka.
+`~/Persistent/`) persistence feature is activated. In that case, if
+persistence was activated read-write, another GTK bookmark pointing to
+that directory is created at login time.
+
+This seemed to be better than introducing yet another persistence
+feature (e.g. for `~/Tor Browser/`): having downloads be either always
+amnesiac or always persistent (unless you restart or do stuff outside
+of the browser) would seem like a regression, since it breaks one of
+the core Tails properties. And forcing it to be a persistent folder by
+default actually has security issues since secure deletion does not
+work as expected on Flash memory. So, we decided that users need to
+have the option to download either to an amnesiac (`~/Tor Browser/`)
+or persistent (`~/Persistent/Tor Browser/`) place, like it was the
+case previously.
+
+So, in a nutshell we give Tor Browser access to:
+
+* `~/Tor Browser/`, which is amnesiac, as everything else in Tails by
+ default; this is set to be the default download directory
+ ([[!tails_gitweb config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js]]);
+* `~/Persistent/Tor Browser/`, that is persistent, and only created
+ when `~/Persistent/` is itself persistent and read-write.
+
+Note that we don't call these folders "Downloads", because e.g.
+if someone creates an ODT file and wants to upload it, having to move
+it to a folder called "Downloads" sounds really weird.
+
Future work
===========
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 11ee3bb..05fc400 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -536,7 +536,6 @@ Enable Windows camouflage via the Tails Greeter checkbox and:
* The "Tails documentation" desktop launcher should open the
[[getting started]] page (automate: [[!tails_ticket 8788]]):
- - in English
- in one language to which the website is translated
- in one language to which the website is not translated (=> English)
* Browse around in the documentation shipped in the image. Internal
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index 089df44..aef8c64 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-02 16:30+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-18 11:01-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -44,32 +45,6 @@ msgstr "Réseau\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "* [Tor](https://www.torproject.org) with:\n"
-#| " - [[stream isolation|contribute/design/stream_isolation]]\n"
-#| " - regular and obfsproxy bridges support\n"
-#| " - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend\n"
-#| "* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
-#| " network configuration\n"
-#| "* [Firefox](http://getfirefox.com) preconfigured with:\n"
-#| " - TorBrowser patches\n"
-#| " - [Torbutton](https://www.torproject.org/torbutton) for anonymity\n"
-#| " and protection against evil JavaScript\n"
-#| " - all cookies are treated as session cookies by default;\n"
-#| " - [HTTPS Everywhere](https://www.eff.org/https-everywhere)\n"
-#| " transparently enables SSL-encrypted connections to a great number\n"
-#| " of major websites\n"
-#| " - [NoScript](http://noscript.net/) to have even more control over JavaScript.\n"
-#| " - [AdBlock Plus](https://adblockplus.org/en/firefox) to remove advertisements.\n"
-#| "* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
-#| " [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
-#| " Messaging\n"
-#| "* [Claws Mail](http://www.claws-mail.org/) e-mail client, with\n"
-#| " GnuPG support\n"
-#| "* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
-#| "* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
-#| "* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing\n"
-#| "* [I2P](https://geti2p.net/) an anonymizing network\n"
msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
diff --git a/wiki/src/doc/about/fingerprint.fr.po b/wiki/src/doc/about/fingerprint.fr.po
index d0dd4e7..a5a2fd6 100644
--- a/wiki/src/doc/about/fingerprint.fr.po
+++ b/wiki/src/doc/about/fingerprint.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-15 18:40+0300\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-18 11:05-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[As explained on our warning page|warning#fingerprint]], when using Tails it is possible to know that you are using Tor. But Tails tries to **make it as difficult as possible to distinguish Tails users from other Tor users**, especially Tor Browser Bundle (TBB) users. If it is possible to determine whether your are a Tails users or a TBB user, this provides more information about you and in consequence reduces your anonymity."
msgid ""
"[[As explained on our warning page|warning#fingerprint]], when using\n"
"Tails it is possible to know that you are using Tor. But Tails tries to\n"
@@ -78,7 +78,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "To make it difficult to distinguish Tails users from TBB users, **the Tor browser tries to provide the same information as the TBB** in order to have similar fingerprints."
msgid ""
"To make it difficult to distinguish Tails users,\n"
"**<span class=\"application\">Tor Browser</span> in Tails tries to provide the same information as <span class=\"application\">Tor Browser</span> on other operating systems** in\n"
@@ -90,7 +89,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "See the [[fingerprint section of known issues page|support/known_issues#fingerprint]] for a list of known differences between the fingerprints of the Tor browser and the TBB."
msgid ""
"See the [[fingerprint section of known issues\n"
"page|support/known_issues#fingerprint]] for a list of known differences\n"
@@ -102,7 +100,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "Apart from that, **some of the extensions included in Tor browser are different** than the ones included in the TBB. More sophisticated attacks can use those differences to distinguish Tails user from TBB users."
msgid ""
"Apart from that, **some of the <span class=\"application\">Tor Browser</span> extensions included in Tails are\n"
"specific to Tails**. More sophisticated\n"
@@ -153,15 +150,6 @@ msgstr ""
"first_steps/startup_options/bridge_mode]]."
#. type: Bullet: ' - '
-#| msgid ""
-#| "A Tails system is **almost exclusively generating Tor activity** on the "
-#| "network. Usually TBB users also have network activity outside of Tor, "
-#| "either from another web browser or other applications. So the proportion "
-#| "of Tor activity could be used to determine whether a user is using Tails "
-#| "or the TBB. If you are sharing your Internet connection with other users "
-#| "that are not using Tails it is probably harder for your ISP to determine "
-#| "whether a single user is generating only Tor traffic and so maybe using "
-#| "Tails."
msgid ""
"A Tails system is **almost exclusively generating Tor activity** on the "
"network. Usually users of <span class=\"application\">Tor Browser</span> on "
@@ -184,13 +172,6 @@ msgstr ""
"utilisateur génère seulement du trafic Tor ou s'il utilise Tails."
#. type: Bullet: ' - '
-#| msgid ""
-#| "Tails **does not use the entry guards mechanism of Tor**. With the [entry "
-#| "guard mechanism](https://www.torproject.org/docs/faq#EntryGuards), a Tor "
-#| "user always uses the same few relays as first hops. As Tails does not "
-#| "store any Tor information between separate working sessions, it does not "
-#| "store the entry guards information either. This behaviour could be used "
-#| "to distinguish Tails users from TBB users across several working sessions."
msgid ""
"Tails **does not use the entry guards mechanism of Tor**. With the [entry "
"guard mechanism](https://www.torproject.org/docs/faq#EntryGuards), a Tor "
@@ -209,12 +190,6 @@ msgstr ""
"travail."
#. type: Bullet: ' - '
-#| msgid ""
-#| "When starting, Tails synchronizes the system clock to make sure it is "
-#| "accurate. While doing this, if the time is set too much in the past or in "
-#| "the future, Tor is shut down and started again. This behavior could be "
-#| "used to distinguish Tails from TBB users, especially this happens every "
-#| "time Tails starts."
msgid ""
"When starting, Tails synchronizes the system clock to make sure it is "
"accurate. While doing this, if the time is set too much in the past or in "
diff --git a/wiki/src/doc/about/openpgp_keys.fr.po b/wiki/src/doc/about/openpgp_keys.fr.po
index eb66a4c..5b640e7 100644
--- a/wiki/src/doc/about/openpgp_keys.fr.po
+++ b/wiki/src/doc/about/openpgp_keys.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails-l10n-wiki\n"
-"POT-Creation-Date: 2015-01-08 22:05+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-17 18:08-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -37,7 +37,6 @@ msgstr ""
#. type: Title =
#, no-wrap
-#| msgid "Mailing-list key\n"
msgid "Private mailing-list key\n"
msgstr "Clé de la liste de discussion privée\n"
@@ -121,12 +120,6 @@ msgstr "Détails de la clé\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " pub 4096R/F93E735F 2009-08-14 Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
-#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
-#| " uid Amnesia <amnesia@boum.org>\n"
-#| " uid T(A)ILS developers (Schleuder mailing-list) <amnesia@boum.org>\n"
-#| " sub 4096R/E89382EB 2009-08-14 [expires: 2015-01-03]\n"
msgid ""
" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
@@ -209,11 +202,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " pub 4096R/1202821CBE2CD9C1 2010-10-07 [expires: 2015-02-05]\n"
-#| " Key fingerprint = 0D24 B36A A9A2 A651 7878 7645 1202 821C BE2C D9C1\n"
-#| " uid Tails developers (signing key) <tails@boum.org>\n"
-#| " uid T(A)ILS developers (signing key) <amnesia@boum.org>\n"
msgid ""
" pub 4096R/0x1202821CBE2CD9C1 2010-10-07 [expires: 2015-04-30]\n"
" Key fingerprint = 0D24 B36A A9A2 A651 7878 7645 1202 821C BE2C D9C1\n"
@@ -272,12 +260,6 @@ msgstr "[[!tails_website tails-bugs.key desc=\"Téléchargez la clé\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " pub 4096R/F93E735F 2009-08-14 Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
-#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
-#| " uid Amnesia <amnesia@boum.org>\n"
-#| " uid T(A)ILS developers (Schleuder mailing-list) <amnesia@boum.org>\n"
-#| " sub 4096R/E89382EB 2009-08-14 [expires: 2015-01-03]\n"
msgid ""
" pub 4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]\n"
" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 3132\n"
diff --git a/wiki/src/doc/about/warning.de.po b/wiki/src/doc/about/warning.de.po
index f6c24ab..1134733 100644
--- a/wiki/src/doc/about/warning.de.po
+++ b/wiki/src/doc/about/warning.de.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-11 14:03+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-16 21:52-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/about/warning.fr.po b/wiki/src/doc/about/warning.fr.po
index 772ee41..71696d3 100644
--- a/wiki/src/doc/about/warning.fr.po
+++ b/wiki/src/doc/about/warning.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-11 14:03+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-25 10:17+0100\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -415,12 +415,6 @@ msgid "Tails doesn't encrypt your documents by default\n"
msgstr "Tails ne chiffre pas vos documents par défaut\n"
#. type: Plain text
-#| msgid ""
-#| "The documents that you might save on storage devices will not be "
-#| "encrypted by default. But Tails provides you with tools to encrypt your "
-#| "documents, such as GnuPG, or encrypt your storage device, such as LUKS. "
-#| "It is likely that the files you may create will keep tracks that they "
-#| "were created using Tails."
msgid ""
"The documents that you might save on storage devices will not be encrypted "
"by default, except in the [[encrypted persistent volume|doc/first_steps/"
@@ -430,12 +424,12 @@ msgid ""
"Tails."
msgstr ""
"Les documents que vous pouvez sauvegarder sur des volumes de stockage, ne "
-"seront pas chiffrés par défaut, sauf si vous utilisez la [[partition persistante chiffrée|doc/first_steps/persistence]]."
-" Mais Tails fournit des outils permettant le chiffrement de vos documents, comme GnuPG,"
-"ou bien des outils permettant le "
-"chiffrement de vos volumes de stockage, comme LUKS. Il est probable que les "
-"fichiers que vous créez ainsi gardent des traces indiquant qu'ils furent créés "
-"en utilisant Tails."
+"seront pas chiffrés par défaut, sauf si vous utilisez la [[partition "
+"persistante chiffrée|doc/first_steps/persistence]]. Mais Tails fournit des "
+"outils permettant le chiffrement de vos documents, comme GnuPG,ou bien des "
+"outils permettant le chiffrement de vos volumes de stockage, comme LUKS. Il "
+"est probable que les fichiers que vous créez ainsi gardent des traces "
+"indiquant qu'ils furent créés en utilisant Tails."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po b/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
index 81cadaf..2ea9087 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-03 15:03+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2014-04-05 17:47+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,9 +106,6 @@ msgstr ""
"[[éteindre Tails|doc/first_steps/shutdown]] rapidement."
#. type: Plain text
-#| msgid ""
-#| "As far as we know, cold boot attacks are not a common procedure for data "
-#| "recovery, but it might still be good to be prepared."
msgid ""
"As far as we know, cold boot attacks are not a common procedure for data "
"recovery, but it might still be good to be prepared. If no cold boot attack "
@@ -117,6 +114,6 @@ msgid ""
msgstr ""
"Autant que nous sachions, les attaques par démarrage à froid ne sont pas "
"encore une procédure standard pour la récupération de données, mais il est "
-"toujours bon d'y être préparé. Si aucune attaque n'est menée directement après "
-"l'extinction de l'ordinateur, la RAM se vide en quelques minutes, et toutes les "
-"données disparaissent."
+"toujours bon d'y être préparé. Si aucune attaque n'est menée directement "
+"après l'extinction de l'ordinateur, la RAM se vide en quelques minutes, et "
+"toutes les données disparaissent."
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 4be012d..765b27b 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: 2014-10-15 18:40+0300\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -40,15 +40,12 @@ msgstr ""
"[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
#. type: Bullet: ' - '
-#| 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 Naviguer_sur_le_web_avec_le_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
+"[[!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]]"
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
index 78059eb..b432d2b 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-04 22:26+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-18 10:51-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,6 @@ msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"Icône du navigateur Tor
#. type: Plain text
#, no-wrap
-#| msgid "Tor Browser is a rebranded version of the [[Mozilla Firefox|http://www.mozilla.com/firefox/]] web browser. Given its popularity many of you have probably used it before and its user interface is like any other modern web browser."
msgid ""
"<span class=\"application\">[Tor Browser](https://www.torproject.org/projects/torbrowser.html.en)</span> is a web\n"
"browser based on [Mozilla Firefox](http://getfirefox.com) and configured to\n"
@@ -89,10 +89,6 @@ msgstr ""
"[[comme expliqué dans les avertissements|about/warning#man-in-the-middle]]."
#. type: Plain text
-#| msgid ""
-#| "For example, here is how the browser looks like when we try to log in an "
-#| "email account at [lavabit.com](http://lavabit.com/), using their [webmail "
-#| "interface](https://lavabit.com/apps/webmail/src/login.php):"
msgid ""
"For example, here is how the browser looks like when we try to log in an "
"email account at [riseup.net](https://riseup.net/), using their [webmail "
@@ -104,15 +100,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[!img doc/anonymous_internet/Tor_Browser/lavabit.png link=no alt=\"Tor browser\"]]\n"
msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"navigateur Tor\"]]\n"
#. type: Plain text
-#| msgid ""
-#| "Notice the small area on the left of the address bar saying \"lavabit.com"
-#| "\" on a blue background and the address beginning with \"https://"
-#| "\" (instead of \"http://\"):"
msgid ""
"Notice the padlock icon on the left of the address bar saying \"mail.riseup."
"net\" and the address beginning with \"https://\" (instead of \"http://\"). "
@@ -155,7 +146,6 @@ msgstr "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere logo\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "[HTTPS Everywhere](https://www.eff.org/https-everywhere) is a Firefox extension shipped in Tails and produced as a collaboration between [The Tor Project](https://torproject.org/) and the [Electronic Frontier Foundation](https://eff.org/). It encrypts your communications with a number of major websites. Many sites on the web offer some limited support for encryption over HTTPS, but make it difficult to use. For instance, they may default to unencrypted HTTP, or fill encrypted pages with links that go back to the unencrypted site. The HTTPS Everywhere extension fixes these problems by rewriting all requests to these sites to HTTPS."
msgid ""
"[HTTPS Everywhere](https://www.eff.org/https-everywhere) is a Firefox extension\n"
"included in <span class=\"application\">Tor Browser</span> and produced as a collaboration between [The Tor\n"
@@ -214,7 +204,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "In Tails all such features are handled from inside the browser by an extension called [Torbutton](https://www.torproject.org/torbutton/) which does all sorts of things to prevent the above type of attacks. But that comes at a price: since this will disable some functionalities and some sites might not work as intended."
msgid ""
"In <span class=\"application\">Tor Browser</span> all such features are handled from inside the browser by an extension\n"
"called [Torbutton](https://www.torproject.org/torbutton/) which does all sorts\n"
@@ -248,7 +237,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "That's why **JavaScript is enabled by default** in Tails."
msgid "That's why **JavaScript is enabled by default** in <span class=\"application\">Tor Browser</span>.\n"
msgstr "C'est pourquoi **JavaScript est activé par défaut** dans le <span class=\"application\">navigateur Tor</span>.\n"
@@ -309,10 +297,6 @@ msgstr "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "To allow more control over JavaScript, for example to disable JavaScript\n"
-#| "completely, Tails includes the <span class=\"application\">NoScript</span>\n"
-#| "extension.\n"
msgid ""
"To allow more control over JavaScript, for example to disable JavaScript\n"
"completely, <span class=\"application\">Tor Browser</span> includes the <span class=\"application\">NoScript</span>\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
index 1724a52..85e5340 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
@@ -11,6 +11,42 @@ Here are a few things worth mentioning in the context of Tails.
[[!toc levels=2]]
+<a id="confinement"></a>
+
+AppArmor confinement
+====================
+
+<span class="application">Tor Browser</span> in Tails is confined with
+[[!debwiki AppArmor]] to protect the system and your data from some
+types of attack against <span class="application">Tor Browser</span>.
+As a consequence, it can only read and write to a limited number of
+folders.
+
+<div class="note">
+
+This is why you might face <span class="guilabel">Permission
+denied</span> errors, for example if you try to download files to the
+<span class="filename">Home</span> folder.
+
+</div>
+
+- You can save files from <span class="application">Tor
+Browser</span> to the <span class="filename">Tor Browser</span> folder
+that is located in the <span class="filename">Home</span> folder.
+The content of this folder will disappear once you shut down Tails.
+
+- If you want to upload files with <span class="application">Tor
+Browser</span>, copy them to that folder first.
+
+- If you have activated the <span
+class="guilabel">[[Personal
+Data|doc/first_steps/persistence/configure#personal_data]]</span>
+persistence feature, then you can also use the <span
+class="filename">Tor Browser</span> folder that is located in the
+<span class="filename">Persistent</span> folder. In that case, the
+content of this folder is saved and remains available across separate
+working sessions.
+
<a id="https"></a>
HTTPS Encryption
diff --git a/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po b/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
index 7809c51..a4eadaa 100644
--- a/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-04 22:26+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-18 10:54-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -59,9 +60,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "The <span class=\"application\">Unsafe Browser</span> has a red and yellow theme\n"
-#| "to differentiate it from the [[Tor Browser|Tor_Browser]].\n"
msgid ""
"The <span class=\"application\">Unsafe Browser</span> has a red and yellow theme\n"
"to differentiate it from [[<span class=\"application\">Tor Browser</span>|Tor_Browser]].\n"
@@ -91,15 +89,11 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"caution\">\n"
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "The <span class=\"application\">Unsafe Browser</span> has a red and yellow theme\n"
-#| "to differentiate it from the [[Tor Browser|Tor_Browser]].\n"
msgid ""
"<p>As a consequence, if you download files using the <span\n"
"class=\"application\">Unsafe Browser</span> it is not possible to access\n"
@@ -115,10 +109,6 @@ msgid "Security recommendations:"
msgstr "Recommandations de sécurité :"
#. type: Bullet: '* '
-#| msgid ""
-#| "Do not run this browser at the same time as the normal, anonymous web "
-#| "browser. This makes it easy to not mistake one browser for the other, "
-#| "which could have catastrophic consequences."
msgid ""
"Do not run this browser at the same time as the anonymous [[<span class="
"\"application\">Tor Browser</span>|Tor_Browser]]. This makes it easy to not "
diff --git a/wiki/src/doc/encryption_and_privacy.index.fr.po b/wiki/src/doc/encryption_and_privacy.index.fr.po
index d49541f..d4193c6 100644
--- a/wiki/src/doc/encryption_and_privacy.index.fr.po
+++ b/wiki/src/doc/encryption_and_privacy.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-02 16:30+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2013-02-26 14:28-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -43,14 +43,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " - [[!traillink Encrypt,_decrypt,_sign,_and_verify_text_using_OpenPGP_and_<span_class=\"application\">Tails_OpenPGP_Applet</span>|encryption_and_privacy/gpgapplet]]\n"
-#| " - [[!traillink Encrypt_text_with_a_passphrase|encryption_and_privacy/gpgapplet/passphrase_encryption]]\n"
-#| " - [[!traillink Encrypt_and_sign_text_using_public-key_cryptography|encryption_and_privacy/gpgapplet/public-key_cryptography]]\n"
-#| " - [[!traillink Decrypt_and_verify_text|encryption_and_privacy/gpgapplet/decrypt_verify]]\n"
-#| " - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
-#| " - [[!traillink Manage_passwords_using_<span_class=\"application\">KeePassX</span>|encryption_and_privacy/manage_passwords]]\n"
-#| " - [[!traillink Calculating_checksums_using_<span_class=\"application\">GtkHash</span>|encryption_and_privacy/checksums]]\n"
msgid ""
" - [[!traillink\n"
" Opening_<span_class=\"application\">TrueCrypt</span>_volumes_using_<span_class=\"code\">cryptsetup</span>|encryption_and_privacy/truecrypt]]\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 b3433cb..66a1d6c 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-26 00:09+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-31 15:44-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -240,10 +241,6 @@ msgstr ""
"secure_deletion#index5h1]], assurez-vous de bien vider la corbeille."
#. type: Bullet: ' 1. '
-#| 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 ""
"Open *Nautilus*, either from the <span class=\"guimenu\">Places</span> menu "
"or the <span class=\"guilabel\">Computer</span> icon on the desktop."
@@ -278,7 +275,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"caution\">\n"
msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
@@ -308,7 +304,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "This method does not work as expected on solid-state disks or USB sticks."
msgid ""
"<p>This method does not work as expected on solid-state disks or USB\n"
"sticks.</p>\n"
@@ -342,9 +337,6 @@ msgstr ""
"gauche pour vous placer à la racine du périphérique."
#. type: Bullet: ' 1. '
-#| msgid ""
-#| "Right-click in the folder and choose <span class=\"guimenuitem\">Wipe "
-#| "available diskspace</span>."
msgid ""
"Right-click in empty space in the right pane and choose <span class="
"\"guimenuitem\">Wipe available diskspace</span>."
@@ -377,9 +369,6 @@ msgstr ""
" </div>\n"
#. type: Bullet: ' 1. '
-#| msgid ""
-#| "The cleaning will start. It can last from a few minutes to a few hours, "
-#| "according to the size of the available diskspace. Be patient…"
msgid ""
"The cleaning starts. It can last from a few minutes to a few hours, "
"according to the size of the available diskspace. Be patient…"
@@ -389,10 +378,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " Note that a file called <span class=\"filename\">oooooooo.ooo</span> is\n"
-#| " created in the folder. <span class=\"application\">Nautilus Wipe</span> tries to make it as big as possible\n"
-#| " to use all the available diskspace and then securely deletes it.\n"
msgid ""
" Note that a file called <span\n"
" class=\"filename\">oooooooo.ooo</span> is created in the\n"
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po b/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
index f9a7b94..bffb147 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-04 17:21+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-19 16:50-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -17,15 +18,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "Opening *TrueCrypt* volumes using `cryptsetup`\n"
msgid "[[!meta title=\"Opening TrueCrypt volumes using cryptsetup\"]]\n"
msgstr "[[!meta title=\"Ouvrir des volumes TrueCrypt avec cryptsetup\"]]\n"
#. type: Plain text
-#| msgid ""
-#| "Lastly, on 28 May 2014, the [*TrueCrypt* website](http://truecrypt."
-#| "sourceforge.net/) announced that the project was no longer maintained and "
-#| "recommended users to find alternate solutions. That website now reads:"
msgid ""
"On 28 May 2014, the [*TrueCrypt* website](http://truecrypt.sourceforge.net/) "
"announced that the project was no longer maintained and recommended users to "
@@ -53,7 +49,6 @@ msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "For the above reasons, we recommend that you use [[LUKS encrypted volumes|/doc/encryption_and_privacy/encrypted_volumes]] instead of *TrueCrypt* volumes."
msgid ""
"<p>We recommend that you use [[Tails encrypted persistence|doc/first_steps/persistence]] or [[LUKS encrypted\n"
"volumes|/doc/encryption_and_privacy/encrypted_volumes]] instead of <span class=\"application\">TrueCrypt</span>\n"
@@ -69,9 +64,6 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
-#| msgid ""
-#| "You can open standard and hidden *TrueCrypt* volumes using the "
-#| "`cryptsetup` command line tool."
msgid ""
"Still, you can open standard and hidden *TrueCrypt* volumes in Tails using "
"the `cryptsetup` command line tool."
@@ -186,8 +178,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/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index d7b8746..bf5ab84 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-15 18:40+0300\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-25 10:17+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -633,10 +634,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "When this feature is activated, changes to the bookmarks in the\n"
-#| "<span class=\"application\">Tor Browser</span> are saved in the persistent\n"
-#| "volume. This does not apply to the Unsafe web browser.\n"
msgid ""
"When this feature is activated, changes to the bookmarks in\n"
"<span class=\"application\">Tor Browser</span> are saved in the persistent\n"
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index aa10ccc..8837788 100644
--- a/wiki/src/doc/first_steps/startup_options.fr.po
+++ b/wiki/src/doc/first_steps/startup_options.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-02 16:30+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-25 10:17+0100\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -130,13 +130,11 @@ msgstr ""
"de démarrage</span>:\n"
#. type: Bullet: ' - '
-#| msgid ""
-#| "<span class=\"command\">truecrypt</span>, to enable [[TrueCrypt|"
-#| "encryption_and_privacy/truecrypt]]"
msgid ""
"<span class=\"command\">i2p</span>, to enable [[I2P|anonymous_internet/I2P]]"
msgstr ""
-"<span class=\"command\">i2p</span>, pour activer [[I2P|anonymous_internet/I2P]]"
+"<span class=\"command\">i2p</span>, pour activer [[I2P|anonymous_internet/"
+"I2P]]"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/download.fr.po b/wiki/src/download.fr.po
index c1336cc..40949ac 100644
--- a/wiki/src/download.fr.po
+++ b/wiki/src/download.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails-l10n-wiki\n"
-"POT-Creation-Date: 2015-01-07 09:55+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2014-10-08 08:32-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -142,10 +142,6 @@ msgstr ""
"Torrent."
#. type: Content of: <div><div><div><p>
-#| msgid ""
-#| "Additionally, you can verify the <a href=[[!inline pages=\"inc/"
-#| "stable_i386_torrent_sig_url\" raw=\"yes\"]]>signature of the Torrent "
-#| "file</a> itself before downloading it."
msgid ""
"Additionally, you can verify the <a href=[[!inline pages=\"inc/"
"stable_i386_torrent_sig_url\" raw=\"yes\"]]>signature of the Torrent file</"
@@ -277,12 +273,12 @@ msgstr ""
#. type: Content of: <div><div>
msgid ""
"[[!toggleable id=\"verify_the_iso_image_using_gnome\" text=\"\"\" <span "
-"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text=\"\"]]"
-"</span>"
+"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text="
+"\"\"]]</span>"
msgstr ""
"[[!toggleable id=\"verify_the_iso_image_using_gnome\" text=\"\"\" <span "
-"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text=\"\"]]"
-"</span>"
+"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text="
+"\"\"]]</span>"
#. type: Content of: <div><div><h2>
msgid "Using Linux with Gnome: Ubuntu, Debian, Tails, Fedora, etc."
diff --git a/wiki/src/inc/stable_i386_date.fr.po b/wiki/src/inc/stable_i386_date.fr.po
index fda4120..6f511a1 100644
--- a/wiki/src/inc/stable_i386_date.fr.po
+++ b/wiki/src/inc/stable_i386_date.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-14 20:51+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2014-09-24 22:28-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,6 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: outside any tag (error?)
-#| msgid "July 22, 2014"
msgid "January 14, 2015"
msgstr "14 janvier 2015"
diff --git a/wiki/src/news.de.po b/wiki/src/news.de.po
index 93bd003..918682f 100644
--- a/wiki/src/news.de.po
+++ b/wiki/src/news.de.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-28 14:25+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-03 01:14-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/news/version_1.3.mdwn b/wiki/src/news/version_1.3.mdwn
new file mode 100644
index 0000000..9a97952
--- /dev/null
+++ b/wiki/src/news/version_1.3.mdwn
@@ -0,0 +1,16 @@
+* Tor Browser is confined with AppArmor => point to the new doc
+
+* Required persistent configuration updates:
+ - Configure Pidgin to use the Tor Browser:
+ * Start Tails
+ * Enable persistence without the read-only option
+ * Start Pidgin
+ * Choose
+ <span class="menuchoice">
+ <span class="guimenu">Tools</span>&nbsp;▸
+ <span class="guimenuitem">Preferences</span>
+ </span>
+ * Click the <span class="guilabel">Browser</span> tab
+ * Type `/usr/local/bin/tor-browser %s` in the <span
+ class="guilabel">Manual</span> field
+ * Click the <span class="button">Close</span> button
diff --git a/wiki/src/news/who_are_you_helping.fr.po b/wiki/src/news/who_are_you_helping.fr.po
index 1f077ef..a0b247b 100644
--- a/wiki/src/news/who_are_you_helping.fr.po
+++ b/wiki/src/news/who_are_you_helping.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-24 10:42+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2014-12-02 09:04-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/press.fr.po b/wiki/src/press.fr.po
index ba76fb5..50ac888 100644
--- a/wiki/src/press.fr.po
+++ b/wiki/src/press.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-14 11:10+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-19 16:52-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "We also sometimes publish press releases but they are not archived on the website. Write us an email at <tails@boum.org> if you want to be informed of future press releases."
msgid ""
"We sometimes publish press releases but they are not archived on\n"
"the website. Write us an email at <tails-press@boum.org> if you want \n"
@@ -81,9 +81,6 @@ msgid "[[About Tails|about]] for a quick overview"
msgstr "[[À propos de Tails|about]] pour une vue d'ensemble rapide"
#. type: Bullet: '* '
-#| msgid ""
-#| "[Quick links to better understand Tor](https://www.torproject.org/press/"
-#| "press.html.en)"
msgid "[Tor overview](https://www.torproject.org/about/overview.html.en)"
msgstr ""
"[Vue d'ensemble de Tor](https://www.torproject.org/about/overview.html.en) "
@@ -116,11 +113,6 @@ msgid "Media appearances\n"
msgstr "Apparitions dans les médias\n"
#. type: Plain text
-#| msgid ""
-#| "As Tails is being more and more used throughout the world, it is "
-#| "mentioned regularly in the press and in research papers. This list is not "
-#| "comprehensive, but illustrates some of the significant articles that have "
-#| "been published about Tails."
msgid ""
"Tails is mentioned regularly in the press and in research papers. This list "
"is not comprehensive, but illustrates some of the significant articles that "
diff --git a/wiki/src/support/faq.fr.po b/wiki/src/support/faq.fr.po
index 89a5ef8..a6d5d2c 100644
--- a/wiki/src/support/faq.fr.po
+++ b/wiki/src/support/faq.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-11 18:12+0100\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-18 11:17-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -384,7 +385,6 @@ msgstr "<a id=\"javascript\"></a>\n"
#. type: Title -
#, no-wrap
-#| msgid "Why is JavaScript enabled by default in the Tor browser?\n"
msgid "Why is JavaScript enabled by default in <span class=\"application\">Tor Browser</span>?\n"
msgstr "Pourquoi est-ce que JavaScript est autorisé par défaut dans le <span class=\"application\">navigateur Tor</span> ?\n"
@@ -432,13 +432,11 @@ msgstr "<a id=\"add-ons\"></a>\n"
#. type: Title -
#, no-wrap
-#| msgid "Can I install other add-ons in the browser?\n"
msgid "Can I install other add-ons in <span class=\"application\">Tor Browser</span>?\n"
msgstr "Puis-je installer d'autres extensions dans le <span class=\"application\">navigateur Tor</span> ?\n"
#. type: Plain text
#, no-wrap
-#| msgid "Installing add-ons in the browser might break the security built in Tails."
msgid "Installing add-ons in <span class=\"application\">Tor Browser</span> might break the security built in Tails.\n"
msgstr "Installer des extensions dans le <span class=\"application\">navigateur Tor</span> pourrait briser la sécurité de Tails.\n"
@@ -503,14 +501,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<div class=\"next\">\n"
-#| " <ul>\n"
-#| " <li>[[Warnings about persistence|doc/first_steps/persistence/warnings#index3h1]]</li>\n"
-#| " <li>[[Browsing the web with the Tor Browser|doc/anonymous_internet/Tor_browser]]</li>\n"
-#| " <li>[[Can I hide the fact that I am using Tails?|doc/about/fingerprint/]]</li>\n"
-#| " </ul>\n"
-#| "</div>\n"
msgid ""
"<div class=\"next\">\n"
" <ul>\n"
@@ -596,7 +586,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "But you can already watch HTML5 videos with the Tor browser."
msgid "But you can already watch HTML5 videos with <span class=\"application\">Tor Browser</span>.\n"
msgstr "Mais vous pouvez déjà regarder les vidéos HTML5 avec le <span class=\"application\">navigateur Tor</span>.\n"
@@ -623,7 +612,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "As explained in our documentation about [[fingerprinting|doc/about/fingerprint]], Tails provides anonymity on the web by making it difficult to distinguish a particular user amongst all the users of Tails and the Tor Browser Bundle (TBB)."
msgid ""
"As explained in our documentation about\n"
"[[fingerprinting|doc/about/fingerprint]], Tails provides anonymity on the web by\n"
@@ -637,7 +625,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "So, the information retrieved by such fingerprinting websites is not harmful for anonymity in itself, as long as it is the same for all Tor users."
msgid ""
"So, the information retrieved by such fingerprinting websites is not harmful for\n"
"anonymity in itself, as long as it is the same for all users of <span class=\"application\">Tor Browser</span>.\n"
@@ -647,7 +634,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "For example, the user-agent property of the browser was set to `Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3`, as of Tails 0.21 and TBB 2.3.25-13. This value preserves your anonymity even if the operating system installed on the computer is Windows NT and you usually run Firefox. On the other hand, changing this value makes you distinguishable from others Tor users and breaks your anonymity."
msgid ""
"For example, the user-agent property of the browser was set to `Mozilla/5.0\n"
"(Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3`,\n"
diff --git a/wiki/src/support/talk.fr.po b/wiki/src/support/talk.fr.po
index d317331..4feffce 100644
--- a/wiki/src/support/talk.fr.po
+++ b/wiki/src/support/talk.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-talk-users-fr\n"
-"POT-Creation-Date: 2014-10-15 18:40+0300\n"
+"POT-Creation-Date: 2015-02-06 10:28+0100\n"
"PO-Revision-Date: 2015-01-25 10:18+0100\n"
"Last-Translator: \n"
"Language-Team: nada-fr <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,11 +34,6 @@ msgstr ""
"S'abonner à notre [[liste mail d'assistance utilisateur|tails-support]]."
#. type: Content of: <div><p>
-#| msgid ""
-#| "This is a public mailing list, so <strong>be careful with what you are "
-#| "sending</strong>. Give only the necessary informations about yourself, "
-#| "and if possible use Tails or the [[Tor Browser Bundle|https://torproject."
-#| "org/torbrowser/]] to hide your IP address."
msgid ""
"This is a public mailing list, so <strong>be careful with what you are "
"sending</strong>. Give only the necessary informations about yourself, and "
@@ -103,16 +99,12 @@ msgid "Mail us on our private mailing list:"
msgstr "Envoyez-nous un mail sur notre liste de discussion privée :"
#. type: Content of: <div><p>
-#| msgid "[[tails@boum.org|mailto:tails@boum.org]]"
msgid ""
"[[tails-support-private@boum.org|mailto:tails-support-private@boum.org]]"
msgstr ""
"[[tails-support-private@boum.org|mailto:tails-support-private@boum.org]]"
#. type: Content of: <div><p>
-#| msgid ""
-#| "Encrypting your emails with our [[OpenPGP key|doc/about/openpgp_keys]] is "
-#| "the only way to achieve end-to-end encryption."
msgid ""
"Encrypting your emails with our [[OpenPGP key|doc/about/"
"openpgp_keys#support]] is the only way to achieve end-to-end encryption."