summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-03-01 11:28:23 +0000
committerTails developers <amnesia@boum.org>2014-03-01 11:28:23 +0000
commitff823a960db09f9afc72cb5e950d1de251e97e86 (patch)
treeeb0bbe81b47bcba655211eb2c7d67b7ff1c1b863
parent51ee7b005a379c38ff7091f1ff5aeba51e5db014 (diff)
parentd0ff87a7dbc5dc2ca0e101d7d312e719f2353fbc (diff)
Merge branch 'devel' into bugfix/6592-fix-races-with-check-for-upgrades
-rw-r--r--config/chroot_apt/preferences22
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_tor-controlport-filter13
-rwxr-xr-xconfig/chroot_local-hooks/52-update-rc.d1
-rw-r--r--config/chroot_local-includes/etc/X11/Xsession.d/80im-starter48
-rw-r--r--config/chroot_local-includes/etc/environment7
-rw-r--r--config/chroot_local-includes/etc/ferm/ferm.conf8
-rw-r--r--config/chroot_local-includes/etc/iceweasel/profile/bookmarks.html2
-rwxr-xr-xconfig/chroot_local-includes/etc/init.d/tor-controlport-filter27
-rw-r--r--config/chroot_local-includes/etc/modprobe.d/no-mei.conf2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software5
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tor-controlport-filter143
-rw-r--r--features/step_definitions/usb.rb40
-rw-r--r--features/support/hooks.rb3
-rw-r--r--features/untrusted_partitions.feature1
-rw-r--r--features/usb_install.feature72
-rw-r--r--wiki/src/about.de.po19
-rw-r--r--wiki/src/about.fr.po19
-rw-r--r--wiki/src/about.mdwn5
-rw-r--r--wiki/src/about.pt.po19
-rw-r--r--wiki/src/blueprint/Mandatory_Access_Control.mdwn53
-rw-r--r--wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn8
-rw-r--r--wiki/src/blueprint/UEFI/syslinux.mdwn2
-rw-r--r--wiki/src/blueprint/UEFI_Secure_boot.mdwn4
-rw-r--r--wiki/src/blueprint/UEFI_boot_on_Mac_without_rEFInd.mdwn9
-rw-r--r--wiki/src/blueprint/faq.mdwn87
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn14
-rwxr-xr-xwiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py2
-rw-r--r--wiki/src/blueprint/vpn_support.mdwn2
-rw-r--r--wiki/src/contribute.de.po31
-rw-r--r--wiki/src/contribute.fr.po29
-rw-r--r--wiki/src/contribute.mdwn19
-rw-r--r--wiki/src/contribute.pt.po31
-rw-r--r--wiki/src/contribute/APT_repository.mdwn10
-rw-r--r--wiki/src/contribute/build/website.mdwn6
-rw-r--r--wiki/src/contribute/calendar.mdwn17
-rw-r--r--wiki/src/contribute/customize.mdwn15
-rw-r--r--wiki/src/contribute/design.mdwn18
-rw-r--r--wiki/src/contribute/design/I2P.mdwn151
-rw-r--r--wiki/src/contribute/design/MAC_address.mdwn67
-rw-r--r--wiki/src/contribute/git.mdwn5
-rw-r--r--wiki/src/contribute/how/code.mdwn151
-rw-r--r--wiki/src/contribute/how/debian.mdwn51
-rw-r--r--wiki/src/contribute/how/input.mdwn5
-rw-r--r--wiki/src/contribute/how/mirror.mdwn2
-rw-r--r--wiki/src/contribute/how/translate.mdwn32
-rwxr-xr-xwiki/src/contribute/l10n_tricks/check_po.sh1
-rw-r--r--wiki/src/contribute/meetings/201402.mdwn93
-rw-r--r--wiki/src/contribute/relationship_with_upstream.mdwn19
-rw-r--r--wiki/src/contribute/release_process.mdwn7
-rw-r--r--wiki/src/contribute/release_process/perl5lib.mdwn52
-rw-r--r--wiki/src/contribute/release_process/tails-greeter.mdwn12
-rw-r--r--wiki/src/contribute/release_process/tails-iuk.mdwn37
-rw-r--r--wiki/src/contribute/release_process/test.mdwn4
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn13
-rw-r--r--wiki/src/contribute/talk.html12
-rw-r--r--wiki/src/contribute/working_together/Redmine.mdwn4
-rw-r--r--wiki/src/doc/about/features.mdwn2
-rw-r--r--wiki/src/doc/about/requirements.de.po20
-rw-r--r--wiki/src/doc/about/requirements.fr.po20
-rw-r--r--wiki/src/doc/about/requirements.mdwn5
-rw-r--r--wiki/src/doc/about/requirements.pt.po20
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.mdwn4
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.fr.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po30
-rw-r--r--wiki/src/doc/first_steps.index.de.po29
-rw-r--r--wiki/src/doc/first_steps.index.fr.po68
-rw-r--r--wiki/src/doc/first_steps.index.mdwn27
-rw-r--r--wiki/src/doc/first_steps.index.pt.po47
-rw-r--r--wiki/src/doc/first_steps/installation.de.po2
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po2
-rw-r--r--wiki/src/doc/first_steps/installation.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation.pt.po2
-rw-r--r--wiki/src/doc/first_steps/installation/manual.de.po2
-rw-r--r--wiki/src/doc/first_steps/installation/manual.fr.po2
-rw-r--r--wiki/src/doc/first_steps/installation/manual.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation/manual.pt.po2
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.de.po88
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.fr.po139
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.mdwn52
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.pt.po88
-rw-r--r--wiki/src/doc/first_steps/persistence.de.po24
-rw-r--r--wiki/src/doc/first_steps/persistence.fr.po42
-rw-r--r--wiki/src/doc/first_steps/persistence.mdwn12
-rw-r--r--wiki/src/doc/first_steps/persistence.pt.po40
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.de.po104
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.fr.po104
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.mdwn42
-rw-r--r--wiki/src/doc/first_steps/persistence/change_passphrase.pt.po104
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.de.po9
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.fr.po12
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.mdwn4
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.pt.po9
-rw-r--r--wiki/src/doc/first_steps/persistence/use.de.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/use.fr.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/use.mdwn6
-rw-r--r--wiki/src/doc/first_steps/persistence/use.pt.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.de.po12
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.fr.po12
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.mdwn12
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.pt.po12
-rw-r--r--wiki/src/doc/first_steps/reset.de.po2
-rw-r--r--wiki/src/doc/first_steps/reset.fr.po2
-rw-r--r--wiki/src/doc/first_steps/reset.mdwn2
-rw-r--r--wiki/src/doc/first_steps/reset.pt.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po10
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn4
-rw-r--r--wiki/src/doc/first_steps/startup_options.pt.po10
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.de.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po4
-rw-r--r--wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn4
-rw-r--r--wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po4
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po5
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po11
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn3
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po5
-rw-r--r--wiki/src/doc/upgrade/error/check.de.po21
-rw-r--r--wiki/src/doc/upgrade/error/check.fr.po21
-rw-r--r--wiki/src/doc/upgrade/error/check.mdwn9
-rw-r--r--wiki/src/doc/upgrade/error/check.pt.po21
-rw-r--r--wiki/src/news.de.po4
-rw-r--r--wiki/src/news.fr.po4
-rw-r--r--wiki/src/news.mdwn2
-rw-r--r--wiki/src/news.pt.po4
-rw-r--r--wiki/src/news/spoof-mac.de.po47
-rw-r--r--wiki/src/news/spoof-mac.fr.po15
-rw-r--r--wiki/src/news/spoof-mac.mdwn2
-rw-r--r--wiki/src/news/spoof-mac.pt.po47
-rw-r--r--wiki/src/shortcuts.mdwn3
-rw-r--r--wiki/src/support/known_issues.de.po14
-rw-r--r--wiki/src/support/known_issues.fr.po37
-rw-r--r--wiki/src/support/known_issues.mdwn17
-rw-r--r--wiki/src/support/known_issues.pt.po14
-rw-r--r--wiki/src/support/tails-support.de.po4
-rw-r--r--wiki/src/support/tails-support.fr.po8
-rw-r--r--wiki/src/support/tails-support.mdwn2
-rw-r--r--wiki/src/support/tails-support.pt.po4
-rw-r--r--wiki/src/support/talk.de.po4
-rw-r--r--wiki/src/support/talk.fr.po6
-rw-r--r--wiki/src/support/talk.html4
-rw-r--r--wiki/src/support/talk.pt.po4
149 files changed, 2125 insertions, 1079 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 0eacae1..a7d3274 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -99,6 +99,10 @@ Package: libpixman-1-0
Pin: origin backports.debian.org
Pin-Priority: 999
+Package: libpurple0
+Pin: origin backports.debian.org
+Pin-Priority: 999
+
Package: libregexp-common-perl
Pin: release o=Debian,n=wheezy
Pin-Priority: 999
@@ -167,6 +171,14 @@ Package: msva-perl
Pin: origin backports.debian.org
Pin-Priority: 999
+Package: pidgin
+Pin: origin backports.debian.org
+Pin-Priority: 999
+
+Package: pidgin-data
+Pin: origin backports.debian.org
+Pin-Priority: 999
+
Package: pcscd
Pin: origin backports.debian.org
Pin-Priority: 999
@@ -316,7 +328,7 @@ Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-kbuild-3.12
-Pin: release o=Debian,a=unstable
+Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: laptop-mode-tools
@@ -327,6 +339,14 @@ Package: monkeysign
Pin: origin backports.debian.org
Pin-Priority: 999
+Package: poedit
+Pin: origin backports.debian.org
+Pin-Priority: 999
+
+Package: spice-vdagent
+Pin: release o=Debian,n=wheezy
+Pin-Priority: 999
+
Package: spice-vdagent
Pin: release o=Debian,n=wheezy
Pin-Priority: 999
diff --git a/config/chroot_local-hooks/06-adduser_tor-controlport-filter b/config/chroot_local-hooks/06-adduser_tor-controlport-filter
new file mode 100755
index 0000000..d9df808
--- /dev/null
+++ b/config/chroot_local-hooks/06-adduser_tor-controlport-filter
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# Create the tor-controlport-filter user.
+#
+# We run tor-controlport-filter under this user,
+# which belongs to the debian-tor group.
+
+echo "creating the tor-controlport-filter user"
+
+adduser --system --quiet --group --no-create-home tor-controlport-filter
+adduser tor-controlport-filter debian-tor
diff --git a/config/chroot_local-hooks/52-update-rc.d b/config/chroot_local-hooks/52-update-rc.d
index 70e7974..4f8a6e0 100755
--- a/config/chroot_local-hooks/52-update-rc.d
+++ b/config/chroot_local-hooks/52-update-rc.d
@@ -9,6 +9,7 @@ tails-reconfigure-kexec
tails-reconfigure-memlockd
tails-sdmem-on-media-removal
tails-set-wireless-devices-state
+tor-controlport-filter
"
PATCHED_INITSCRIPTS="
diff --git a/config/chroot_local-includes/etc/X11/Xsession.d/80im-starter b/config/chroot_local-includes/etc/X11/Xsession.d/80im-starter
index a37d8b9..fc1a54e 100644
--- a/config/chroot_local-includes/etc/X11/Xsession.d/80im-starter
+++ b/config/chroot_local-includes/etc/X11/Xsession.d/80im-starter
@@ -1,42 +1,52 @@
#!/bin/sh
-# Start the IBus input method and configure it with
-# sensible settings for use in Tails.
+# Configure IBus with sensible settings for use in Tails,
+# and with the correct default engine for the user's login locale.
+
+# The IBus engine is only started if required by the login locale,
+# as it is known to interfer with keyboard shortcuts in some locales.
+
+# The environment variables are exported however, so the user can
+# start IBus manually using the launcher "IBus Preferences"
+# in the System->Preferences menu.
+
+# XXX: This script may not be needed anymore when Tails
+# is based on GNOME 3.6 or newer (which is in Debian Jessie).
+# https://help.gnome.org/misc/release-notes/3.6/i18n-ibus.html
-# The input method will be configured so it is usable
-# no matter what locale the user login with, but with
-# correct default engine for those locales that need it.
# Deside order in which input methods are preferred
# (chinese needs pinyin, japanese needs anthy, korean needs hangul)
# (bopomofo is an alternative input method for chinese)
LANGPREFIX=`echo "$LANG" | sed 's/_.*//'`
+PREFLIST='[pinyin,anthy,hangul,bopomofo]'
+NEEDIBUS='n'
case "$LANGPREFIX" in
ja)
PREFLIST='[anthy,pinyin,hangul,bopomofo]'
+ NEEDIBUS='y'
;;
ko)
PREFLIST='[hangul,pinyin,anthy,bopomofo]'
+ NEEDIBUS='y'
;;
zh)
- PREFLIST='[pinyin,anthy,hangul,bopomofo]'
- ;;
- *)
- PREFLIST=
+ PREFLIST='[pinyin,bopomofo,anthy,hangul]'
+ NEEDIBUS='y'
;;
esac
-if [ -n "$PREFLIST" ]; then
- # Configure enabled input methods and their preferred order
- gconftool-2 --type=list --list-type=string --set \
- /desktop/ibus/general/preload_engines "$PREFLIST"
+# Configure enabled input methods and their preferred order
+gconftool-2 --type=list --list-type=string --set \
+ /desktop/ibus/general/preload_engines "$PREFLIST"
- # Start the IBus input method daemon
- /usr/bin/ibus-daemon --daemonize --xim
+# Export environment variables to enable use of IBus
+export GTK_IM_MODULE='ibus'
+export QT_IM_MODULE='ibus'
+export XMODIFIERS='@im=ibus'
- # Export environment variables to enable use of IBus
- export GTK_IM_MODULE='ibus'
- export QT_IM_MODULE='ibus'
- export XMODIFIERS='@im=ibus'
+# Start the IBus input method daemon, if required by locale
+if [ "$NEEDIBUS" = 'y' ]; then
+ /usr/bin/ibus-daemon --daemonize --xim
fi
diff --git a/config/chroot_local-includes/etc/environment b/config/chroot_local-includes/etc/environment
index 43abaaa..a503d1e 100644
--- a/config/chroot_local-includes/etc/environment
+++ b/config/chroot_local-includes/etc/environment
@@ -9,6 +9,13 @@ SOCKS5_SERVER=127.0.0.1:9050
TOR_SOCKS_HOST='127.0.0.1'
TOR_SOCKS_PORT='9151'
+# Allow Torbutton access to the control port filter (for new identity).
+# Setting a password is required, otherwise Torbutton attempts to
+# read the authentication cookie file instead, which fails.
+TOR_CONTROL_HOST='127.0.0.1'
+TOR_CONTROL_PORT='9052'
+TOR_CONTROL_PASSWD='passwd'
+
GIT_PROXY_COMMAND=/usr/local/bin/connect-socks
# Port that the monkeysphere validation agent listens on
diff --git a/config/chroot_local-includes/etc/ferm/ferm.conf b/config/chroot_local-includes/etc/ferm/ferm.conf
index 77dc3dd..f6dc946 100644
--- a/config/chroot_local-includes/etc/ferm/ferm.conf
+++ b/config/chroot_local-includes/etc/ferm/ferm.conf
@@ -41,12 +41,16 @@ domain ip {
# White-list access to Tor's ControlPort
daddr 127.0.0.1 proto tcp dport 9051 {
- mod owner uid-owner amnesia ACCEPT;
# Needed by a workaround in tordate (NM's 20-time.sh hook)
# for temporarily changing Tor's logging severity.
mod owner uid-owner root ACCEPT;
}
+ # White-list access to the Tor control port filter
+ daddr 127.0.0.1 proto tcp dport 9052 {
+ mod owner uid-owner amnesia ACCEPT;
+ }
+
# White-list access to Tor's TransPort
daddr 127.0.0.1 proto tcp dport 9040 {
mod owner uid-owner amnesia ACCEPT;
@@ -75,7 +79,7 @@ domain ip {
}
# White-list access to I2P
- # For more information, see https://tails/boum.org/contribute/design/I2P and http://www.i2p2.de/ports
+ # For more information, see https://tails/boum.org/contribute/design/I2P and https://geti2p.net/ports
daddr 127.0.0.1 proto tcp syn mod multiport destination-ports (2827 4444 4445 6668 7656 7657 7658 7659 7660 8998) {
mod owner uid-owner amnesia ACCEPT;
}
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/bookmarks.html b/config/chroot_local-includes/etc/iceweasel/profile/bookmarks.html
index 7779b5e..4998b4a 100644
--- a/config/chroot_local-includes/etc/iceweasel/profile/bookmarks.html
+++ b/config/chroot_local-includes/etc/iceweasel/profile/bookmarks.html
@@ -23,6 +23,6 @@
<DT><h3>I2P</h3>
<DL><p>
<DT><A HREF="http://127.0.0.1:7657/index.jsp">I2P router console</A>
- <DT><A HREF="http://www.i2p2.i2p/">I2P homepage</A>
+ <DT><A HREF="http://i2p-projekt.i2p/">I2P homepage</A>
</DL><p>
</DL><p>
diff --git a/config/chroot_local-includes/etc/init.d/tor-controlport-filter b/config/chroot_local-includes/etc/init.d/tor-controlport-filter
new file mode 100755
index 0000000..584d0ce
--- /dev/null
+++ b/config/chroot_local-includes/etc/init.d/tor-controlport-filter
@@ -0,0 +1,27 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: tor-controlport-filter
+# Required-Start: $remote_fs
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop:
+# Short-Description: Tor control port filter proxy
+# Description: Tor control port filter proxy
+### END INIT INFO
+
+case "$1" in
+ start)
+ start-stop-daemon \
+ --start \
+ --quiet \
+ --background \
+ --chuid tor-controlport-filter:tor-controlport-filter \
+ --exec /usr/local/sbin/tor-controlport-filter
+ ;;
+ *)
+ echo "Usage: $0 start" >&2
+ exit 3
+ ;;
+esac
+
+exit 0
diff --git a/config/chroot_local-includes/etc/modprobe.d/no-mei.conf b/config/chroot_local-includes/etc/modprobe.d/no-mei.conf
new file mode 100644
index 0000000..1d917d1
--- /dev/null
+++ b/config/chroot_local-includes/etc/modprobe.d/no-mei.conf
@@ -0,0 +1,2 @@
+blacklist mei-me
+blacklist mei
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index 57457cf..3b7614db 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -82,10 +82,13 @@ def install_additional_packages():
syslog.syslog("Starting to install additional software...")
if has_additional_packages_list():
syslog.syslog("Found additional packages list")
- else:
+ elif os.path.isdir(PERSISTENCE_DIR):
syslog.syslog(syslog.LOG_WARNING, "Warning: no configuration file found, creating an empty one.")
create_additional_packages_list()
return True
+ else:
+ syslog.syslog(syslog.LOG_WARNING, "Warning: persistence is not mounted, exiting")
+ return True
packages = get_additional_packages()
if not packages:
syslog.syslog(syslog.LOG_WARNING, "Warning: no packages to install, exiting")
diff --git a/config/chroot_local-includes/usr/local/sbin/tor-controlport-filter b/config/chroot_local-includes/usr/local/sbin/tor-controlport-filter
new file mode 100755
index 0000000..dbf454e
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/sbin/tor-controlport-filter
@@ -0,0 +1,143 @@
+#!/usr/bin/python
+
+# Tor control port filter proxy, only white-listing SIGNAL NEWNYM.
+
+# This filter proxy should allow Torbutton to request a
+# new Tor circuit, without exposing dangerous control requests
+# like "GETINFO address" to applications running as a local user.
+
+# If something goes wrong, an error code is returned, and
+# Torbutton will display a warning dialog that New Identity failed.
+
+# Only one application can talk through this filter proxy
+# simultaneously. A malicious application that is running as a
+# local user could use this to prevent other applications from
+# doing NEWNYM. But it could just as well rewrite the
+# TOR_CONTROL_PORT environment variable to itself or do something else.
+
+import socket
+import binascii
+
+# Limit the length of a line, to prevent DoS attacks trying to
+# crash this filter proxy by sending infinitely long lines.
+MAX_LINESIZE = 128
+
+class UnexpectedAnswer(Exception):
+ def __init__(self, msg):
+ self.msg = msg
+ def __str__(self):
+ return "[UnexpectedAnswer] " + self.msg
+
+def do_newnym_real():
+ # Read authentication cookie
+ with open("/var/run/tor/control.authcookie", "rb") as f:
+ rawcookie = f.read(32)
+
+ hexcookie = binascii.hexlify(rawcookie)
+
+ # Connect to the real control port
+ sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ sock.settimeout(10.0)
+ sock.connect("/var/run/tor/control")
+ readh = sock.makefile("r")
+ writeh = sock.makefile("w")
+
+ # Authenticate
+ writeh.write("AUTHENTICATE " + hexcookie + "\n")
+ writeh.flush()
+
+ answer = readh.readline(MAX_LINESIZE)
+ if not answer.startswith("250"):
+ raise UnexpectedAnswer("AUTHENTICATE failed")
+
+ # Send the newnym signal
+ writeh.write("SIGNAL NEWNYM\n")
+ writeh.flush()
+
+ answer = readh.readline(MAX_LINESIZE)
+ if not answer.startswith("250"):
+ raise UnexpectedAnswer("SIGNAL NEWNYM failed")
+
+ # Close the connection
+ writeh.write("QUIT\n")
+ writeh.flush()
+
+ answer = readh.readline(MAX_LINESIZE)
+ if not answer.startswith("250"):
+ raise UnexpectedAnswer("QUIT failed")
+
+ sock.close()
+
+def do_newnym():
+ # Catch innocent exceptions, will report error instead
+ try:
+ do_newnym_real()
+ print "Newnym went fine"
+ return True
+ except (IOError, UnexpectedAnswer) as e:
+ print "Warning: Couldn't perform newnym!"
+ print e
+ return False
+
+def handle_connection(sock):
+ # Create file handles for the socket
+ readh = sock.makefile("r")
+ writeh = sock.makefile("w")
+
+ # Keep accepting commands
+ while True:
+ # Read in a newline terminated line
+ line = readh.readline(MAX_LINESIZE)
+ if not line: break
+
+ # Check what it is
+ if line.startswith("AUTHENTICATE"):
+ # Don't check authentication, since only
+ # safe commands are allowed
+ writeh.write("250 OK\n")
+ elif line.startswith("SIGNAL NEWNYM"):
+ # Perform a real SIGNAL NEWNYM (new Tor circuit)
+ if do_newnym():
+ writeh.write("250 OK\n")
+ else:
+ writeh.write("510 Newnym signal failed\n")
+ elif line.startswith("QUIT"):
+ # Quit session
+ writeh.write("250 Closing connection\n")
+ break
+ else:
+ # Everything else we ignore/block
+ writeh.write("510 Command filtered\n")
+
+ # Ensure the answer was written
+ writeh.flush()
+
+ # Ensure all data was written
+ writeh.flush()
+
+def main():
+ # Listen on port 9052 (we cannot use 9051 as Tor uses that one)
+ server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+ server.bind(("127.0.0.1", 9052))
+ server.listen(4)
+
+ print "Tor control port filter started, listening on 9052"
+
+ # Accept and handle connections one after one,
+ # sessions are short enough that the added complexity of
+ # simultaneous connections are unnecessary (in absence of attacks)
+ while True:
+ clisock, cliaddr = server.accept()
+
+ try:
+ print "Accepted a connection"
+ handle_connection(clisock)
+ print "Connection closed"
+ except IOError:
+ print "Connection closed (IOError)"
+
+ clisock.close()
+
+if __name__ == "__main__":
+ main()
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index eb51020..025befa 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -249,29 +249,35 @@ Given /^I enable persistence with password "([^"]+)"$/ do |pwd|
@screen.type(pwd)
end
-Given /^persistence is not enabled$/ do
+def tails_persistence_enabled?
+ persistence_state_file = "/var/lib/live/config/tails.persistence"
+ return @vm.execute("test -e '#{persistence_state_file}'").success? &&
+ @vm.execute('. #{persistence_state_file} && ' +
+ 'test "$TAILS_PERSISTENCE_ENABLED" = true').success?
+end
+
+Given /^persistence is enabled$/ do
next if @skip_steps_while_restoring_background
- data_part_dev = boot_device + "2"
- assert(!@vm.execute("grep -q '^#{data_part_dev} ' /proc/mounts").success?,
- "Partition '#{data_part_dev}' from the boot device is mounted")
+ try_for(120, :msg => "Persistence is disabled") do
+ tails_persistence_enabled?
+ end
+ # Check that all persistent directories are mounted
+ mount = @vm.execute("mount").stdout.chomp
+ for dir in persistent_dirs do
+ assert(mount.include?("on #{dir} "),
+ "Persistent directory '#{dir}' is not mounted")
+ end
end
-Given /^I enable read-only persistence with password "([^"]+)"$/ do |pwd|
- step "I enable persistence with password \"#{pwd}\""
+Given /^persistence is disabled$/ do
next if @skip_steps_while_restoring_background
- @screen.wait_and_click('TailsGreeterPersistenceReadOnly.png', 10)
+ assert(!tails_persistence_enabled?, "Persistence is enabled")
end
-Given /^persistence has been enabled$/ do
+Given /^I enable read-only persistence with password "([^"]+)"$/ do |pwd|
+ step "I enable persistence with password \"#{pwd}\""
next if @skip_steps_while_restoring_background
- try_for(120, :msg => "Some persistent dir was not mounted") {
- mount = @vm.execute("mount").stdout.chomp
- persistent_dirs.each do |dir|
- if ! mount.include? "on #{dir} "
- raise "persistent dir #{dir} missing"
- end
- end
- }
+ @screen.wait_and_click('TailsGreeterPersistenceReadOnly.png', 10)
end
def boot_device
@@ -419,7 +425,7 @@ Then /^only the expected files should persist on USB drive "([^"]+)"$/ do |name|
step "the computer boots Tails"
step "I enable read-only persistence with password \"asdf\""
step "I log in to a new session"
- step "persistence has been enabled"
+ step "persistence is enabled"
step "GNOME has started"
step "I have closed all annoying notifications"
step "the expected persistent files are present in the filesystem"
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 63f8e39..a84af86 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -115,6 +115,9 @@ After('@product') do |scenario|
@vm.destroy if @vm
end
+After('@product', '~@keep_volumes') do
+ VM.storage.clear_volumes
+end
# For @source tests
###################
diff --git a/features/untrusted_partitions.feature b/features/untrusted_partitions.feature
index 5c98d19..03ab2ad 100644
--- a/features/untrusted_partitions.feature
+++ b/features/untrusted_partitions.feature
@@ -3,6 +3,7 @@ Feature: Untrusted partitions
As a Tails user
I don't want to touch other media than the one Tails runs from
+ @keep_volumes
Scenario: Tails can boot from live systems stored on hard drives
Given a computer
And I create a 2 GiB disk named "live_hd"
diff --git a/features/usb_install.feature b/features/usb_install.feature
index 52a3b4d..9a8a21f 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -5,14 +5,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
and upgrade it to new Tails versions
and use persistence
- # An issue with this feature is that scenarios depend on each other.
- # For instance, "Tails boot from USB drive without persistent
- # partition" depends on "Install Tails to a USB drive". This feels
- # strange, but the alternative would be gigantic scenarios that
- # test what to me feels like logically different features, e.g.
- # the two named above would be concatenated.
-
- Scenario: Installing to a pristine USB drive
+ @keep_volumes
+ Scenario: Installing Tails to a pristine USB drive
Given a computer
And the computer is set to boot from the Tails DVD
And the network is unplugged
@@ -28,7 +22,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
But there is no persistence partition on USB drive "current"
And I unplug USB drive "current"
- Scenario: Booting a USB drive without a persistent partition and creating one
+ @keep_volumes
+ Scenario: Booting Tails from a USB drive without a persistent partition and creating one
Given a computer
And the computer is set to boot from USB drive "current"
And the network is unplugged
@@ -46,7 +41,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then a Tails persistence partition with password "asdf" exists on USB drive "current"
And I completely shutdown Tails
- Scenario: Booting a USB drive without enabling persistence
+ @keep_volumes
+ Scenario: Booting Tails from a USB drive with a disabled persistent partition
Given a computer
And the computer is set to boot from USB drive "current"
And the network is unplugged
@@ -56,10 +52,11 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then Tails seems to have booted normally
And Tails is running from USB drive "current"
And the boot device has safe access rights
- And persistence is not enabled
+ And persistence is disabled
But a Tails persistence partition with password "asdf" exists on USB drive "current"
- Scenario: Writing to a read/write persistent partition
+ @keep_volumes
+ Scenario: Writing files to a read/write-enabled persistent partition
Given a computer
And the computer is set to boot from USB drive "current"
And the network is unplugged
@@ -71,14 +68,15 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I log in to a new session
And GNOME has started
And I have closed all annoying notifications
- And persistence has been enabled
+ And persistence is enabled
And I write some files expected to persist
And persistent filesystems have safe access rights
And persistence configuration files have safe access rights
And I completely shutdown Tails
Then only the expected files should persist on USB drive "current"
- Scenario: Writing to a read-only-enabled persistent partition
+ @keep_volumes
+ Scenario: Writing files to a read-only-enabled persistent partition
Given a computer
And the computer is set to boot from USB drive "current"
And the network is unplugged
@@ -90,13 +88,14 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I log in to a new session
And GNOME has started
And I have closed all annoying notifications
- And persistence has been enabled
+ And persistence is enabled
And I write some files not expected to persist
And I remove some files expected to persist
And I completely shutdown Tails
Then only the expected files should persist on USB drive "current"
- Scenario: Deleting a persistent partition
+ @keep_volumes
+ Scenario: Deleting a Tails persistent partition
Given a computer
And the computer is set to boot from USB drive "current"
And the network is unplugged
@@ -106,13 +105,14 @@ 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 Tails seems to have booted normally
- And persistence is not enabled
+ And persistence is disabled
But a Tails persistence partition with password "asdf" exists on USB drive "current"
And I have closed all annoying notifications
When I delete the persistent partition
Then there is no persistence partition on USB drive "current"
- Scenario: Installing an old version to a pristine USB drive
+ @keep_volumes
+ Scenario: Installing an old version of Tails to a pristine USB drive
Given a computer
And the computer is set to boot from the old Tails DVD
And the network is unplugged
@@ -128,7 +128,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
But there is no persistence partition on USB drive "old"
And I unplug USB drive "old"
- Scenario: Creating a persistent partition with the old USB installation
+ @keep_volumes
+ Scenario: Creating a persistent partition with the old Tails USB installation
Given a computer
And the computer is set to boot from USB drive "old"
And the network is unplugged
@@ -142,7 +143,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then a Tails persistence partition with password "asdf" exists on USB drive "old"
And I completely shutdown Tails
- Scenario: Writing to a read/write persistent partition with the old USB installation
+ @keep_volumes
+ Scenario: Writing files to a read/write-enabled persistent partition with the old Tails USB installation
Given a computer
And the computer is set to boot from USB drive "old"
And the network is unplugged
@@ -153,14 +155,15 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I log in to a new session
And GNOME has started
And I have closed all annoying notifications
- And persistence has been enabled
+ And persistence is enabled
And I write some files expected to persist
And persistent filesystems have safe access rights
And persistence configuration files have safe access rights
And I completely shutdown Tails
Then only the expected files should persist on USB drive "old"
- Scenario: Upgrading an old USB installation from DVD
+ @keep_volumes
+ Scenario: Upgrading an old Tails USB installation from a Tails DVD
Given a computer
And I clone USB drive "old" to a new USB drive "to_upgrade"
And the computer is set to boot from the Tails DVD
@@ -175,7 +178,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then Tails is installed on USB drive "to_upgrade"
And I unplug USB drive "to_upgrade"
- Scenario: Booting a USB drive upgraded from DVD with persistence enabled
+ @keep_volumes
+ Scenario: Booting Tails from a USB drive upgraded from DVD with persistence enabled
Given a computer
And the computer is set to boot from USB drive "to_upgrade"
And the network is unplugged
@@ -188,7 +192,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the boot device has safe access rights
And the expected persistent files are present in the filesystem
- Scenario: Upgrading an old USB installation from USB
+ @keep_volumes
+ Scenario: Upgrading an old Tails USB installation from another Tails USB drive
Given a computer
And I clone USB drive "old" to a new USB drive "to_upgrade"
And the computer is set to boot from USB drive "current"
@@ -206,7 +211,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I unplug USB drive "to_upgrade"
And I unplug USB drive "current"
- Scenario: Booting a USB drive upgraded from USB with persistence enabled
+ @keep_volumes
+ Scenario: Booting Tails from a USB drive upgraded from USB with persistence enabled
Given a computer
And the computer is set to boot from USB drive "to_upgrade"
And the network is unplugged
@@ -215,12 +221,13 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I enable read-only persistence with password "asdf"
And I log in to a new session
Then Tails seems to have booted normally
- And persistence has been enabled
+ And persistence is enabled
And Tails is running from USB drive "to_upgrade"
And the boot device has safe access rights
And the expected persistent files are present in the filesystem
- Scenario: Upgrading an old USB installation from ISO
+ @keep_volumes
+ Scenario: Upgrading an old Tails USB installation from an ISO image
Given a computer
And I clone USB drive "old" to a new USB drive "to_upgrade"
And the computer is set to boot from the Tails DVD
@@ -245,12 +252,13 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I enable read-only persistence with password "asdf"
And I log in to a new session
Then Tails seems to have booted normally
- And persistence has been enabled
+ And persistence is enabled
And Tails is running from USB drive "to_upgrade"
And the boot device has safe access rights
And the expected persistent files are present in the filesystem
- Scenario: Installing to a USB drive with an empty MBR partition table
+ @keep_volumes
+ Scenario: Installing Tails to a USB drive with an MBR partition table but no partitions
Given a computer
And I create a 4 GiB disk named "mbr"
And I create a msdos label on disk "mbr"
@@ -279,7 +287,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the boot device has safe access rights
And there is no persistence partition on USB drive "mbr"
- Scenario: Cat:ing an hybrid ISO to a USB drive and booting it
+ @keep_volumes
+ Scenario: Cat:ing a Tails isohybrid to a USB drive and booting it
Given a computer
And I create a 4 GiB disk named "isohybrid"
And I cat an ISO hybrid of the Tails image to disk "isohybrid"
@@ -291,7 +300,8 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
Then Tails seems to have booted normally
And Tails is running from USB drive "isohybrid"
- Scenario: Try upgrading but end up installing to a USB drive containing an isohybrid installation
+ @keep_volumes
+ Scenario: Try upgrading but end up installing Tails to a USB drive containing a Tails isohybrid installation
Given a computer
And the computer is set to boot from the Tails DVD
And the network is unplugged
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index a44bb48..e6019a1 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-13 13:35+0100\n"
+"POT-Creation-Date: 2014-02-25 13:10+0100\n"
"PO-Revision-Date: 2014-01-06 23:22+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,6 +79,12 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"tor\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention with Tor\n"
@@ -199,6 +205,12 @@ msgstr ""
"Um mehr darüber zu erfahren, wie der Gebrauch von Tor erzwungen wird, lesen "
"Sie unser [[Design-Dokument|contribute/design/Tor_enforcement]]."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"amnesia\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
@@ -480,6 +492,11 @@ msgstr ""
msgid "[IprediaOS](http://www.ipredia.org/)"
msgstr "[Odebian](http://www.odebian.org/)"
+#. type: Bullet: '* '
+msgid ""
+"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
+msgstr ""
+
#. type: Title ##
#, no-wrap
msgid "Discontinued, abandoned or sleeping projects"
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index bfe8ff0..a6c1a16 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2014-02-13 13:35+0100\n"
+"POT-Creation-Date: 2014-02-25 13:10+0100\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -80,6 +80,12 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"tor\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention with Tor\n"
@@ -199,6 +205,12 @@ msgstr ""
"Pour en savoir plus sur comment l'utilisation de Tor est imposée, voir la\n"
"[[documentation de conception|contribute/design/Tor_enforcement]]."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"amnesia\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
@@ -475,6 +487,11 @@ msgstr ""
msgid "[IprediaOS](http://www.ipredia.org/)"
msgstr "[Odebian](http://www.odebian.org/)"
+#. type: Bullet: '* '
+msgid ""
+"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
+msgstr ""
+
#. type: Title ##
#, no-wrap
msgid "Discontinued, abandoned or sleeping projects"
diff --git a/wiki/src/about.mdwn b/wiki/src/about.mdwn
index b01b0c4..c0587e6 100644
--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -20,6 +20,8 @@ and sound editor, etc.
[[!toc levels=1]]
+<a id="tor"></a>
+
Online anonymity and censorship circumvention with Tor
======================================================
@@ -61,6 +63,8 @@ website](https://www.torproject.org/):
To learn more about how the usage of Tor is enforced, see our [[design
document|contribute/design/Tor_enforcement]].
+<a id="amnesia"></a>
+
Use anywhere but leave no trace
===============================
@@ -153,6 +157,7 @@ if some project is listed in the wrong category.
* [Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)
* [uVirtus](http://uvirtus.org/)
* [IprediaOS](http://www.ipredia.org/)
+* [JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)
## Discontinued, abandoned or sleeping projects
diff --git a/wiki/src/about.pt.po b/wiki/src/about.pt.po
index 7715922..62c6798 100644
--- a/wiki/src/about.pt.po
+++ b/wiki/src/about.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2014-02-13 13:35+0100\n"
+"POT-Creation-Date: 2014-02-25 13:10+0100\n"
"PO-Revision-Date: 2012-10-26 13:43-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -95,6 +95,12 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"tor\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention with Tor\n"
@@ -203,6 +209,12 @@ msgid ""
"document|contribute/design/Tor_enforcement]]."
msgstr ""
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"cryptography\"></a>\n"
+msgid "<a id=\"amnesia\"></a>\n"
+msgstr "<a id=\"cryptography\"></a>\n"
+
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
@@ -520,6 +532,11 @@ msgstr ""
msgid "[IprediaOS](http://www.ipredia.org/)"
msgstr "[Odebian](http://www.odebian.org/)"
+#. type: Bullet: '* '
+msgid ""
+"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
+msgstr ""
+
#. type: Title ##
#, no-wrap
msgid "Discontinued, abandoned or sleeping projects"
diff --git a/wiki/src/blueprint/Mandatory_Access_Control.mdwn b/wiki/src/blueprint/Mandatory_Access_Control.mdwn
index 5056f07..228e7da 100644
--- a/wiki/src/blueprint/Mandatory_Access_Control.mdwn
+++ b/wiki/src/blueprint/Mandatory_Access_Control.mdwn
@@ -22,14 +22,51 @@ Seems really easy to write and maintain policies, many already exist.
A [critical problem with stacked
filesystems](<https://lists.ubuntu.com/archives/apparmor/2012-April/002623.html>),
-such as aufs, must be fixed at upstream level before
-we can use AppArmor in Tails. It *should* be fixed in AppArmor 3.0,
-which is scheduled for 2013 Q3.
-
-It can be workaround'd if
-<https://bugs.launchpad.net/apparmor/+bug/888077> is fixed (a month or
-two of dev time, we're told), or by adding "Kernel based alias
-support" (being discussed privately, stay tuned).
+such as aufs, must be fixed at upstream level before we can use
+AppArmor in Tails.
+
+It can be workaround'd with alias rules if
+<https://bugs.launchpad.net/apparmor/+bug/888077> is fixed , or by
+adding "Kernel based alias support". An AppArmor upstream developer is
+working on improving alias rules support so that we can workaround
+this. Once this work is complete:
+
+* We will be able to (and actually, we'll need to) add an alias rule:
+
+ echo 'alias / -> /lib/live/mount/rootfs/filesystem.squashfs/,' \
+ >> /etc/apparmor.d/tunables/alias
+
+* We will need to change the `/lib{,32,64}/**/ld{,32,64}-*.so mrix,`
+ rule into:
+
+ /lib{32,64}/**/ld{,32,64}-*.so mrix,
+ /lib/{[^l],l[^i],li[^v],liv[^e],live[^/]}**/ld{,32,64}-*.so mrix,
+
+ ... to avoid it to overlap due to our added alias.
+
+* We have to deal with other overlaps, such as `audit deny owner /**/*
+ m,` (from the Evince profile), that will take away the executable
+ mmap permission from> applications in the `/lib/live/` path, if the
+ root user (who owns the file) tries to launch an application:
+
+ - either we use rewrite rules instead of aliases. Rewrite rule is
+ the same as alias except it doesn't result in an overlay of the
+ two rule sets, hence getting rid of the deny and x perm conflicts;
+ - or we need a way to define that the alias rules should have
+ priority in the union, thus removing the problems; this requires
+ an update to the AppArmor permission merging logic.
+
+* Alias rules dramatically increase the profiles compile time (e.g.
+ 1min40 for the Evince one, and 8 seconds with the aforementioned
+ rule change). To mitigate that problem, we could:
+
+ - either look at the rules and see if we can't make some tweaks to
+ them;
+ - or ship a precompiled policy cached. As long as the parser and
+ kernel are in sync, then policy can be pulled straight from the
+ cache, without an compilation. If the parser detects that the
+ policy is out of date, then the cache will be ignored and
+ compilation will happen.
grsecurity
----------
diff --git a/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn b/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn
index 6be7f75..e9bef15 100644
--- a/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn
+++ b/wiki/src/blueprint/Persistence:_add_iceweasel_client_certificates_preset.mdwn
@@ -1,6 +1,4 @@
-Persistence of client certicicates in the browser would make their use a lot easier
-
-[[wishlist]]
+Persistence of client certificates in the browser would make their use a lot easier
Research
========
@@ -15,8 +13,8 @@ Another approach would be to use `pk12util` (from `nss3-tools` package, see <htt
According to
<https://support.mozilla.org/en-US/kb/Recovering%20important%20data%20from%20an%20old%20profile>:
- - key3.db - This file stores your key database for your passwords.
- - cert8.db - This file stores all your security certificate settings
+ - `key3.db` - This file stores your key database for your passwords.
+ - `cert8.db` - This file stores all your security certificate settings
and any SSL certificates you have imported into Firefox.
It's being replaced by a sqlite database.
diff --git a/wiki/src/blueprint/UEFI/syslinux.mdwn b/wiki/src/blueprint/UEFI/syslinux.mdwn
index 910f3d6..16c2dad 100644
--- a/wiki/src/blueprint/UEFI/syslinux.mdwn
+++ b/wiki/src/blueprint/UEFI/syslinux.mdwn
@@ -1,5 +1,5 @@
Prerequisite: Tails with an amd64 kernel (e.g. from current
-experimental branch).
+devel branch).
Tested with syslinux 6.02+dfsg-1.
diff --git a/wiki/src/blueprint/UEFI_Secure_boot.mdwn b/wiki/src/blueprint/UEFI_Secure_boot.mdwn
index 398575d..16b0822 100644
--- a/wiki/src/blueprint/UEFI_Secure_boot.mdwn
+++ b/wiki/src/blueprint/UEFI_Secure_boot.mdwn
@@ -11,6 +11,7 @@ Resources
- [Handling UEFI Secure Boot in smaller distributions](http://mjg59.dreamwidth.org/17542.html)
- [Secure Boot bootloader for distributions available now](http://mjg59.dreamwidth.org/20303.html)
- [An overview of Fedora's Secure Boot implementation](http://mjg59.dreamwidth.org/18945.html)
+ - [Terse howto for getting a signed shim](http://mjg59.dreamwidth.org/20303.html?thread=783183#cmt783183)
* [Ubuntu Privacy Remix](https://www.privacy-cd.org/)'s next release
(UPR 12.04r1) will support UEFI; a beta is available; they copied
the solution from Ubuntu 13.10 (beta): the shim bootloader and
@@ -23,3 +24,6 @@ Resources
by Greg Kroah-Hartman
* Linux Foundation's
[Making UEFI Secure Boot Work With Open Platforms](http://linuxfoundation.org/publications/making-uefi-secure-boot-work-with-open-platforms)
+* [ALT Linux' SecureBoot mini HOWTO](http://en.altlinux.org/UEFI_SecureBoot_mini-HOWTO) and
+ [their](http://git.altlinux.org/people/mike/packages/?p=mkimage.git;a=blob;f=tools/mki-copy-efiboot;h=1ca6b0137c7488ae50540b027cf4a541074daba5;hb=HEAD)
+ [scripts](http://git.altlinux.org/people/mike/packages/?p=mkimage.git;a=blob;f=tools/mki-pack-isoboot;h=85ca988c6aab94e3c44e64519baf2231e39d8d24;hb=HEAD)
diff --git a/wiki/src/blueprint/UEFI_boot_on_Mac_without_rEFInd.mdwn b/wiki/src/blueprint/UEFI_boot_on_Mac_without_rEFInd.mdwn
index 8dd4d47..8252192 100644
--- a/wiki/src/blueprint/UEFI_boot_on_Mac_without_rEFInd.mdwn
+++ b/wiki/src/blueprint/UEFI_boot_on_Mac_without_rEFInd.mdwn
@@ -2,6 +2,15 @@ Ticket: [[!tails_ticket 6242]]
[[!toc levels=2]]
+Status
+======
+
+At least on some Mac's, once feature/uefi is merged, Tails can boot
+fine without rEFInd: one has to press Alt before powering the laptop
+up, and keep it pressed until a menu appears, and then choose the
+entry that's called *Boot EFI* (as every other entry) and looks like
+a USB stick.
+
Resources
=========
diff --git a/wiki/src/blueprint/faq.mdwn b/wiki/src/blueprint/faq.mdwn
index e9b0744..d854397 100644
--- a/wiki/src/blueprint/faq.mdwn
+++ b/wiki/src/blueprint/faq.mdwn
@@ -344,6 +344,90 @@ is another anonymous network different from Tor.
</div>
+Can I use Tails with a VPN?
+---------------------------
+
+Three possible scenarios need to be distinguished:
+
+ - Using a VPN instead of Tor
+ - Using a VPN to connect to Tor (VPN before Tor)
+ - Connecting to a VPN using Tor (VPN after Tor)
+
+For more information, see our [[blueprint on VPN
+support|blueprint/vpn_support/]].
+
+### Using a VPN instead of Tor
+
+It is a very [[fundamental assumption of Tails|about#tor]] to force all outgoing
+traffic to anonymity networks such as Tor or I2P. VPN are not anonymity
+networks, because the administrators of the VPN can know both where you are
+connecting from and where you are connecting to. Tor provides anonymity by
+making it impossible for a single point in the network to know both the origin
+and the destination of a connection.
+
+### Using a VPN to connect to Tor (VPN before Tor)
+
+In some situations, you might be forced to use a VPN to connect to the Internet,
+for example by your ISP. This is currenlty not possible using Tails. See
+[[!tails_ticket 5858]].
+
+[[Tor bridges|doc/first_steps/startup_options/bridge_mode]] can also be useful
+to bypass the limitations of your ISP.
+
+### Connecting to a VPN using Tor (VPN after Tor)
+
+In some situtations, it can be useful to connect to a VPN through Tor:
+
+ - To access services that block connections coming from Tor.
+ - To access ressources only available inside a VPN, for example at your
+ company or University.
+
+This is currenlty not possible easily using Tails.
+
+<a id="luks"></a>
+
+How strong is the encryption of the persistent volume and LUKS?
+---------------------------------------------------------------
+
+Tails uses LUKS to encrypt the persistent volume. This is the same technique as
+the one we recommend for [[creating and using encrypted
+volumes|doc/encryption_and_privacy/encrypted_volumes]] in general.
+
+LUKS is a very popular standard for disk encryption in Linux. LUKS is the
+default technique for full-disk encryption proposed by many distribution,
+including Debian and Ubuntu, when installing a regular system.
+
+Currently the default cipher is `aes-cbc-essiv:sha256` with a key size of 256
+bits.
+
+To understand better how persistence work, see our [[design
+document|contribute/design/persistence]].
+
+Can I use TrueCrypt with Tails?
+-------------------------------
+
+Yes, but Truecrypt needs to be activated when starting Tails, see our
+[[documentation|doc/encryption_and_privacy/truecrypt]].
+
+However, we recommend using other [[encryption
+tools|doc/encryption_and_privacy/encrypted_volumes]] such as [[LUKS|faq#luks]].
+The development process of Truecrypt has been long criticized, while LUKS is a
+recognized open standard.
+
+Why is the time set wrong?
+--------------------------
+
+When Tails starts, your timezone is set to UTC (Greenwich time). So, this time
+might be a few hours in the future if you are West from the UK, or in the past
+if you are East from the UK. The minutes should be accurate.
+
+We do this for anonymity reasons: if some application reveals your actual
+timezone, it might help identifying who you are.
+
+Having all Tails users set to the same timezone, makes it more difficult to
+distinguish you amongst all the other Tails users.
+
+<!--
<rawmaterial>
Proxy
@@ -383,6 +467,7 @@ included in the default package set.
</rawmaterial>
Other topics
-============
+------------
- XXX_NICK_XXX in Pidgin might be caused by a lack of RAM
+-->
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn b/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
index d4ef1c5..facc661 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
+++ b/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
@@ -1,3 +1,7 @@
+[[!meta title="Revamp the Greeter UI"]]
+
+**Ticket**: [[!tails_ticket 5464 desc="#5464"]]
+
[[!toc levels=2]]
Rationale
@@ -45,7 +49,7 @@ usability study.
### References
-http://design.canonical.com/2013/08/usability-testing-how-do-we-design-effective-tasks/
+<http://design.canonical.com/2013/08/usability-testing-how-do-we-design-effective-tasks/>
Prototypes
==========
@@ -263,14 +267,6 @@ Report #4
Otherwise looks great.
-Minor grammar typo. It says:
-
- you choosed french language
-
-should be
-
- you chose french language
-
Possible roadmaps
=================
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py b/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py
index edfa069..33741ed 100755
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py
+++ b/wiki/src/blueprint/tails-greeter:_revamp_UI/mockups/mockup.py
@@ -105,7 +105,7 @@ class GreeterMockup:
("Luxembouge", None, "cb_keyboard"),
("Suisse", None, "cb_keyboard"),
("Other...", None, "cb_more_languages")])
- self._locale_label.set_text("you choosed french language; please select your region")
+ self._locale_label.set_text("you have chosen French language; please select your region")
if self._linkbutton_language:
self._linkbutton_language.set_visible(True)
diff --git a/wiki/src/blueprint/vpn_support.mdwn b/wiki/src/blueprint/vpn_support.mdwn
index e0d8248..c356861 100644
--- a/wiki/src/blueprint/vpn_support.mdwn
+++ b/wiki/src/blueprint/vpn_support.mdwn
@@ -19,7 +19,7 @@ Tails' goal.
### Use cases
-1. Access services that blocks Tor.
+1. Access services that block Tor.
2. Reach a local resource on a VPN that is not accessible in any other
way.
3. Reach a VPN non-anonymously (e.g. your account is tied to you IRL)
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index b7762e5..4e0e087 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-14 11:52+0100\n"
+"POT-Creation-Date: 2014-02-28 12:58+0100\n"
"PO-Revision-Date: 2013-04-05 14:08+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,12 +100,13 @@ msgid ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribute with your computer skills</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
-" <h3>Software developer</h3>\n"
+" <h3>Developer and maintainer</h3>\n"
" <img src=\"software_developer.svg\" />\n"
-" <p>Developers with very diverse skills can improve Tails code.</p>\n"
+" <p>Software people with very diverse skills can improve Tails.</p>\n"
" <ul>\n"
" <li>[[Fix a bug|contribute/how/code]]</li>\n"
" <li>[[Implement a feature|contribute/how/code]]</li>\n"
+" <li>[[Improve Tails by working on Debian|contribute/how/debian]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
@@ -230,16 +231,12 @@ msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
" - [[Easy tasks|easy_tasks]] for new contributors\n"
-" - Tasks by type of work:\n"
-" [code](https://labs.riseup.net/code/projects/tails/issues?query_id=119),\n"
-" [documentation](https://labs.riseup.net/code/projects/tails/issues?query_id=118),\n"
-" [website](https://labs.riseup.net/code/projects/tails/issues?query_id=115),\n"
-" [test](https://labs.riseup.net/code/projects/tails/issues?query_id=116),\n"
-" [sysadmin](https://labs.riseup.net/code/projects/tails/issues?query_id=113)\n"
+" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
+" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
" - [[Build the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
-" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom Debian packages\n"
+" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
" - [[FAQ for contributors|contribute/faq]]\n"
" - [[Glossary for contributors|contribute/glossary]]\n"
@@ -281,11 +278,10 @@ msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"Bugs that we are interested in on the Debian BTS: [by usertag](http://udd."
-"debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org), [by severity]"
-"(http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org)"
-msgstr ""
+#, fuzzy
+#| msgid "[[Help other Tails users|contribute/how/help]]"
+msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
+msgstr "[[Helfen Sie anderen Tails-Nutzern|contribute/how/help]]"
#. type: Plain text
#, no-wrap
@@ -424,11 +420,6 @@ msgstr ""
#~ "[[Stellen Sie den Entwicklern benötigte Eingaben zur Verfügung|contribute/"
#~ "how/input]]"
-#, fuzzy
-#~| msgid "[[Help other Tails users|contribute/how/help]]"
-#~ msgid "[[Improve the website|contribute/how/website]]"
-#~ msgstr "[[Helfen Sie anderen Tails-Nutzern|contribute/how/help]]"
-
#~ msgid ""
#~ "<a href=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-"
#~ "dev@boum.org\">bugs that we are interested in on the Debian BTS</a>"
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index 5a5e0ab..eed8318 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-02-14 11:52+0100\n"
+"POT-Creation-Date: 2014-02-28 12:58+0100\n"
"PO-Revision-Date: 2013-12-20 19:33+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -224,12 +224,13 @@ msgid ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribute with your computer skills</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
-" <h3>Software developer</h3>\n"
+" <h3>Developer and maintainer</h3>\n"
" <img src=\"software_developer.svg\" />\n"
-" <p>Developers with very diverse skills can improve Tails code.</p>\n"
+" <p>Software people with very diverse skills can improve Tails.</p>\n"
" <ul>\n"
" <li>[[Fix a bug|contribute/how/code]]</li>\n"
" <li>[[Implement a feature|contribute/how/code]]</li>\n"
+" <li>[[Improve Tails by working on Debian|contribute/how/debian]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
@@ -370,16 +371,12 @@ msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
" - [[Easy tasks|easy_tasks]] for new contributors\n"
-" - Tasks by type of work:\n"
-" [code](https://labs.riseup.net/code/projects/tails/issues?query_id=119),\n"
-" [documentation](https://labs.riseup.net/code/projects/tails/issues?query_id=118),\n"
-" [website](https://labs.riseup.net/code/projects/tails/issues?query_id=115),\n"
-" [test](https://labs.riseup.net/code/projects/tails/issues?query_id=116),\n"
-" [sysadmin](https://labs.riseup.net/code/projects/tails/issues?query_id=113)\n"
+" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
+" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
" - [[Build the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
-" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom Debian packages\n"
+" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
" - [[FAQ for contributors|contribute/faq]]\n"
" - [[Glossary for contributors|contribute/glossary]]\n"
@@ -421,11 +418,10 @@ msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"Bugs that we are interested in on the Debian BTS: [by usertag](http://udd."
-"debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org), [by severity]"
-"(http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org)"
-msgstr ""
+#, fuzzy
+#| msgid "[[Improve the website|contribute/how/website]]"
+msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
+msgstr "[[Améliorer le site web|contribute/how/website]]"
#. type: Plain text
#, no-wrap
@@ -567,9 +563,6 @@ msgstr ""
#~ msgid "[[Provide needed input to developers|contribute/how/input]]"
#~ msgstr "[[Apporter de l'aide aux développeurs|contribute/how/input]]"
-#~ msgid "[[Improve the website|contribute/how/website]]"
-#~ msgstr "[[Améliorer le site web|contribute/how/website]]"
-
#~ msgid ""
#~ "<a href=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-"
#~ "dev@boum.org\">bugs that we are interested in on the Debian BTS</a>"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index 253ed5d..e4bc078 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -60,12 +60,13 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-roles-3">
<h2>Contribute with your computer skills</h2>
<div class="contribute-role" id="developer">
- <h3>Software developer</h3>
+ <h3>Developer and maintainer</h3>
<img src="software_developer.svg" />
- <p>Developers with very diverse skills can improve Tails code.</p>
+ <p>Software people with very diverse skills can improve Tails.</p>
<ul>
<li>[[Fix a bug|contribute/how/code]]</li>
<li>[[Implement a feature|contribute/how/code]]</li>
+ <li>[[Improve Tails by working on Debian|contribute/how/debian]]</li>
</ul>
</div>
<div class="contribute-role" id="sysadmin">
@@ -129,16 +130,12 @@ Tools for contributors
- [[Redmine bug tracker|contribute/working_together/Redmine]]
- [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)
- [[Easy tasks|easy_tasks]] for new contributors
- - Tasks by type of work:
- [code](https://labs.riseup.net/code/projects/tails/issues?query_id=119),
- [documentation](https://labs.riseup.net/code/projects/tails/issues?query_id=118),
- [website](https://labs.riseup.net/code/projects/tails/issues?query_id=115),
- [test](https://labs.riseup.net/code/projects/tails/issues?query_id=116),
- [sysadmin](https://labs.riseup.net/code/projects/tails/issues?query_id=113)
+ - [Tasks](https://labs.riseup.net/code/projects/tails/issues)
+ can be filtered by type of work (see links in the sidebar)
- [[Building a Tails image|contribute/build]]
- [[Build the website|contribute/build/website]]
- [[Customize Tails|contribute/customize]]
- - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom Debian packages
+ - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages
- [[APT repository|contribute/APT_repository]], to store our custom Debian packages
- [[FAQ for contributors|contribute/faq]]
- [[Glossary for contributors|contribute/glossary]]
@@ -158,9 +155,7 @@ Relationship with upstream
==========================
- [[Relationship with upstream|contribute/relationship_with_upstream]]
- - Bugs that we are interested in on the Debian BTS:
- [by usertag](http://udd.debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org),
- [by severity](http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org)
+ - [[Improve Tails by working on Debian|contribute/how/debian]]
<a id="collective-process"></a>
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index b155879..b0d7b04 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-14 11:52+0100\n"
+"POT-Creation-Date: 2014-02-28 12:58+0100\n"
"PO-Revision-Date: 2013-04-05 14:08+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -102,12 +102,13 @@ msgid ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribute with your computer skills</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
-" <h3>Software developer</h3>\n"
+" <h3>Developer and maintainer</h3>\n"
" <img src=\"software_developer.svg\" />\n"
-" <p>Developers with very diverse skills can improve Tails code.</p>\n"
+" <p>Software people with very diverse skills can improve Tails.</p>\n"
" <ul>\n"
" <li>[[Fix a bug|contribute/how/code]]</li>\n"
" <li>[[Implement a feature|contribute/how/code]]</li>\n"
+" <li>[[Improve Tails by working on Debian|contribute/how/debian]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
@@ -231,16 +232,12 @@ msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
" - [[Easy tasks|easy_tasks]] for new contributors\n"
-" - Tasks by type of work:\n"
-" [code](https://labs.riseup.net/code/projects/tails/issues?query_id=119),\n"
-" [documentation](https://labs.riseup.net/code/projects/tails/issues?query_id=118),\n"
-" [website](https://labs.riseup.net/code/projects/tails/issues?query_id=115),\n"
-" [test](https://labs.riseup.net/code/projects/tails/issues?query_id=116),\n"
-" [sysadmin](https://labs.riseup.net/code/projects/tails/issues?query_id=113)\n"
+" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
+" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
" - [[Build the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
-" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom Debian packages\n"
+" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
" - [[FAQ for contributors|contribute/faq]]\n"
" - [[Glossary for contributors|contribute/glossary]]\n"
@@ -282,11 +279,10 @@ msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"Bugs that we are interested in on the Debian BTS: [by usertag](http://udd."
-"debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org), [by severity]"
-"(http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org)"
-msgstr ""
+#, fuzzy
+#| msgid "[[Help other Tails users|contribute/how/help]]"
+msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
+msgstr "[[Ajude outros usuários/as do Tails|contribute/how/help]]"
#. type: Plain text
#, no-wrap
@@ -437,11 +433,6 @@ msgstr "[[!inline pages=\"contribute/talk\" raw=\"yes\"]]"
#~ "[[Forneça as informações necessárias aos desenvolvedores/as|contribute/"
#~ "how/input]]"
-#, fuzzy
-#~| msgid "[[Help other Tails users|contribute/how/help]]"
-#~ msgid "[[Improve the website|contribute/how/website]]"
-#~ msgstr "[[Ajude outros usuários/as do Tails|contribute/how/help]]"
-
#~ msgid ""
#~ "<a href=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-"
#~ "dev@boum.org\">bugs that we are interested in on the Debian BTS</a>"
diff --git a/wiki/src/contribute/APT_repository.mdwn b/wiki/src/contribute/APT_repository.mdwn
index 3083f18..6f52402 100644
--- a/wiki/src/contribute/APT_repository.mdwn
+++ b/wiki/src/contribute/APT_repository.mdwn
@@ -59,8 +59,6 @@ The build system adds the relevant APT sources:
Also, if we're building from a bugfix or feature branch, add its
own suite.
-This logic is implemented in Tails 0.14~rc2 and later.
-
SSH access
==========
@@ -193,10 +191,10 @@ operation must be done on the APT suites.
merging a topic branch into it, whose purpose is to *remove* custom
packages). To this end, compare the resulting list of (package,
version) in the `experimental` APT suite with the one saved before
- the merge, check Git merges history if needed, apply common sense,
- and remove from `experimental` the packages that were removed from
- it a while ago, and were just erroneously re-added by the
- merge operation.
+ the merge (hint: use the `tails-diff-suites` script), check Git
+ merges history if needed, apply common sense, and remove from
+ `experimental` the packages that were removed from it a while ago,
+ and were just erroneously re-added by the merge operation.
<a id="workflow-reset"></a>
diff --git a/wiki/src/contribute/build/website.mdwn b/wiki/src/contribute/build/website.mdwn
index 3f2524d..6021dcd 100644
--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -5,7 +5,11 @@ Here is how to build the wiki offline.
First, install the dependencies:
apt-get install libyaml-perl libyaml-libyaml-perl po4a \
- perlmagick libyaml-syck-perl ikiwiki/squeeze-backports
+ perlmagick libyaml-syck-perl ikiwiki
+
+If running Debian Squeeze, also run:
+
+ apt-get install ikiwiki/squeeze-backports
Then run the following command, at the root of the Git folder:
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index abce38a..a8e1337 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,10 +1,21 @@
[[!meta title="Calendar"]]
-* 2014-02-03 - Tails 0.22.1, testing final ISO
+* 2014-02-24 - Low-hanging fruits session (10am-2pm CET)
-* 2014-02-04 - [Tails 0.22.1](https://labs.riseup.net/code/projects/tails/roadmap#Tails_0.22.1), release
+* 2014-03-05:
+ - [Tails contributors meeting](https://mailman.boum.org/pipermail/tails-dev/2014-February/004934.html)
+ - Feature freeze for Tails 0.23
+ - Tag, build and upload Tails 0.23 release candidate
-* 2014-03-18 - [Tails 0.23](https://labs.riseup.net/code/projects/tails/roadmap#Tails_0.23)
+* 2014-03-06 - Test Tails 0.23 release candidate
+
+* 2014-03-07 - Release Tails 0.23 release candidate
+
+* 2014-03-17 - Tag, build and upload Tails 0.23 final
+
+* 2014-03-18 - Test Tails 0.23 final
+
+* 2014-03-19 - [Tails 0.23](https://labs.riseup.net/code/projects/tails/roadmap#Tails_0.23)
* 2014-04-29 - [Tails 1.0](https://labs.riseup.net/code/projects/tails/roadmap#Tails_1.0)
diff --git a/wiki/src/contribute/customize.mdwn b/wiki/src/contribute/customize.mdwn
index 222a282..f132035 100644
--- a/wiki/src/contribute/customize.mdwn
+++ b/wiki/src/contribute/customize.mdwn
@@ -1,5 +1,16 @@
-How to [[contribute/build]] a custom system based on The Amnesic Incognito
-Live System?
+This page documents a bit how to [[contribute/build]] a custom system
+based on Tails.
+
+<div class="caution">
+
+<strong>The resulting system will effectively be a fork of
+Tails, that only you can support: do not expect any help from us about
+it.<br />
+Please consider [[having your changes merged|contribute/how/code]]
+into Tails instead.
+</strong>
+</div>
+
[[!toc levels=2]]
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 7ba7e2a..155e5fd 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -756,14 +756,15 @@ OpenOffice.org and gedit.
Tails ships with IBus and a few engines (Anthy for Japanese, Pinyin
and Bopomofo for Chinese, and Hangul for Korean).
-A login script configures and enables IBus for all locales: it must be
-started at login time to be fully usable (environment variables must
-be set up); also, one may want to work on documents written in
-Chinese, Japanese or Korean even when selecting English as their
-preferred language.
+A login script prepares and configures IBus. When a Japanese,
+Chinese or Korean locale is selected, this login script selects
+the right default input method, and then starts the IBus daemon.
-When a Japanese, Chinese or Korean locale is selected, this login
-script also selects the right default input method.
+Since one may want to work on documents written in
+Chinese, Japanese or Korean even when selecting English as their
+preferred language, IBus can also be manually started in other locales
+using the "IBus Preferences" launcher in the System->Preferences menu.
+IBus' environment variables is always exported on login to make this work.
- [[!tails_gitweb config/chroot_local-includes/etc/X11/Xsession.d/80im-starter]]
@@ -847,9 +848,12 @@ an attacker who controls it could simply ask Tor the public
IP through the `GETINFO address` command.
To prevent this, access to the Tor control port is only
granted to the vidalia user, who is running Vidalia.
+A filtering proxy to the control port exists, so
+Torbutton still can perform safe commands like `SIGNAL NEWNYM`.
- [[!tails_gitweb chroot_local-hooks/06-adduser_vidalia]]
- [[!tails_gitweb chroot_local-includes/usr/local/sbin/restart-vidalia]]
+- [[!tails_gitweb chroot_local-includes/usr/local/sbin/tor-controlport-filter]]
- [[!tails_gitweb chroot_local-includes/etc/tor/torrc]]
### 3.6.3 DNS
diff --git a/wiki/src/contribute/design/I2P.mdwn b/wiki/src/contribute/design/I2P.mdwn
index 6bc6196..35a98e7 100644
--- a/wiki/src/contribute/design/I2P.mdwn
+++ b/wiki/src/contribute/design/I2P.mdwn
@@ -11,7 +11,7 @@ be able to access eepsites from Tails.
Versions
========
-I2P[http://www.i2p2.de] has been included since Tails v0.7 with Iceweasel
+I2P[https:/geti2p.net] has been included since Tails v0.7 with Iceweasel
preconfigured using FoxyProxy so that eepsites (`.i2p` TLD) are directed to
I2P. All other traffic gets routed through Tor.
@@ -118,123 +118,24 @@ End users will access services using *client tunnels*. I2P is shipped with a
few tunnels preconfigured and the ports that they use have exceptions added to
ferm. These ports include:
-<table>
- <tr>
- <td>
- 2727
- </td>
- <td>
- BOB
- </td>
- <td>
- <a href="http://www.i2p2.de/bob">BOB</a> is an application bridge allowing non-Java clients to interact with I2P.
- </td>
- </tr>
- <tr>
- <td>
- 4444
- </td>
- <td>
- I2P HTTP Proxy
- </td>
- <td>
- Used to access sites with the <code>.i2p</code> TLD
- </td>
- </tr>
- <tr>
- <td>
- 4445
- </td>
- <td>
- HTTPS Outproxy tunnel
- </td>
- <td>
- Disabled in by default in <a href="http://127.0.0.1:7657/i2ptunnel">I2PTunnel</a> since all HTTPS traffic is routed through Tor.
- </td>
- </tr>
- <tr>
- <td>
- 6668
- </td>
- <td>
- Tunnel to Irc2P
- </td>
- <td>
- Used to connect to the main I2P-only IRC network
- </td>
- </tr>
- <tr>
- <td>
- 7656
- </td>
- <td>
- SAM
- </td>
- <td>
- SAM is an application bridge allowing non-Java clients to use I2P.
- More information: <a href="http://www.i2p2.de/sam">SAMv1</a>, <a href="http://www.i2p2.de/samv2">SAMv2</a>,
- <a href="http://www.i2p2.de/samv3"</a>SAMv3</a>
- </td>
- </tr>
- <tr>
- <td>
- 7657
- </td>
- <td>
- I2P router console
- </td>
- <td>
- The router console is accessible via the web browser at <a href="http://127.0.0.1:7657">http://127.0.0.1:7657</a>
- </td>
- </tr>
- <tr>
- <td>
- 7658
- </td>
- <td>
- local 'eepsite'
- </td>
- <td>
- Each I2P installation is configured out of the box with the
- possibility to host one's own website (or *eepsite*) on the I2P
- network. The eepsite will not be acessible remotely unless its <a href="http://127.0.0.1:7657/i2ptunnel#localServerTunnelList">tunnel</a>
- is started.
- </td>
- </tr>
- <tr>
- <td>
- 7659
- </td>
- <td>
- SMTP Proxy
- </td>
- <td>
- Tunnel to smtp.postman.i2p. More information is available from within I2P at <a href="http://hq.postman.i2p/?page_id=10">Postman's HQ</a>
- </td>
- </tr>
- <tr>
- <td>
- 7660
- </td>
- <td>
- POP3 Proxy
- </td>
- <td>
- Tunnel to pop3.postman.i2p. More information is available from within I2P at <a href="http://hq.postman.i2p/?page_id=11">Postman's HQ</a>
- </td>
- </tr>
- <tr>
- <td>
- 8998
- </td>
- <td>
- MTN Proxy
- </td>
- <td>
- Tunnel to mtn.i2p2.i2p, a <a href="http://monotone.ca">Monotone</a> server.
- </td>
- </tr>
-</table>
+* 2727, BOB: [BOB](https://geti2p.net/bob) is an application bridge allowing
+ non-Java clients to interact with I2P.
+* 4444, I2P HTTP Proxy: Used to access sites with the `.i2p` TLD
+* 4445 ,HTTPS Outproxy tunnel: Disabled in by default in Tails in
+ [I2PTunnel](http://127.0.0.1:7657/i2ptunnel) since all HTTPS traffic in Tails
+ gets routed through Tor.
+* 6668, Tunnel to Irc2P: Used to connect to the main I2P-only IRC network
+* 7656, [SAM](https://geti2p.net/sam): SAM is an application bridge allowing
+ non-Java clients to use I2P. More information:
+ [SAMv1](https://geti2p.net/samv1), [SAMv2](https://geti2p.net/samv2),
+* 7657, I2P router console: The router console is accessible in the web browser at <http://127.0.0.1:7657>
+* 7658, local 'eepsite': Each I2P installation is configured out of the box
+ with the possibility to host one's own website (or *eepsite*) on the I2P
+ network. The eepsite will not be acessible remotely unless its
+ [tunnel](http://127.0.0.1:7657/i2ptunnel#localServerTunnelList) is started.
+* 7659, SMTP Proxy: Tunnel to `smtp.postman.i2p`. More information is available from within I2P at [Postman's HQ](http://hq.postman.i2p/?page_id=10)
+* 7660, POP3 Proxy: Tunnel to `pop3.postman.i2p`. More information is available from within I2P at [Postman's HQ](http://hq.postman.i2p/?page_id=11)
+* 8998, MTN Proxy: Tunnel to `mtn.i2p2.i2p`, a [Monotone](http://monotone.ca) server.
Features that require an administration password
================================================
@@ -254,12 +155,12 @@ Package source and upgrading I2P
Tails uses the I2P (and deps)
[Debian packages prepared by KillYourTV](http://deb.i2p2.no/), the official I2P
-Linux package maintainer as listed on the [I2P Team page](https://www.i2p2.de/team).
-The I2P source package and its binaries will be imported into to our own
+Linux package maintainer as listed on the [I2P Team page](https://geti2p.net/team).
+The I2P source package and its binaries are imported into to our own
[[APT repository|APT_repository]] into the devel or stable suite. The suite
will depend on whether a major- or point-release is being prepared.
-## Check the imported binary packages
+## Check the binary packages
### Content
@@ -276,6 +177,14 @@ will depend on whether a major- or point-release is being prepared.
Have a look at `*.{pre,post}{inst,rm}`.
+## Import the packages
+
+1. scp the source and binary packages to incoming.deb.tails.boum.org
+1. move the uploaded files somewhere, and set permissions on it, so
+ that the `reprepro` user can read it
+1. use `reprepro includesrc` to import the source package(s)
+1. use `reprepro includedeb` to import the binary package(s)
+
Things to meditate upon
=======================
diff --git a/wiki/src/contribute/design/MAC_address.mdwn b/wiki/src/contribute/design/MAC_address.mdwn
index e0334c3..f69fdf2 100644
--- a/wiki/src/contribute/design/MAC_address.mdwn
+++ b/wiki/src/contribute/design/MAC_address.mdwn
@@ -260,37 +260,11 @@ leaks happen:
The sudden switch of MAC address may result in a breach of
AvoidIdMacSpoof.
-The first is clearly less bad than the second, but the ideal, which
-avoids these problems altogether.
-
The real solution is therefore to eliminate the problematic this time
frame completely by preventing any network devices from being enabled
at all until the decision has been made, and have the MAC spoofing
setting applied immediately when the device is added.
-# User interface design
-
-This option, which is of the on/off variety, will be implemented as a
-check box in Tails Greeter. The problem is to formulate a concise
-description that's clear and informative enough to guide the user to
-make an informed decision.
-
-In our previous blueprint we state that we want a user interface that
-presents the option using "simple words such as 'I am using a public
-computer' instead of speaking geek-language about mac addresses or
-whatever". However, in the use case analysis above it's obvious that
-simply "public or not" isn't enough to differentiate between the
-different use cases, and it seems unlikely to be the case for any
-other easily understood concept.
-
-Therefore it seems that the label of the option isn't what we should
-focus on, so we might just as well call it "Spoof all MAC addresses",
-which at least can help advanced users that know what they're
-doing. Beyond a concise summary in Tails Greeter, it's also highly
-important that we have clear and complete documentation about this,
-and that we make this documentation easily available from inside
-Tails Greeter.
-
<a id="active-probe-fingerprinting"></a>
# Active probe fingerprinting
@@ -329,7 +303,9 @@ As suggested in the "Leak prevention" section, we block all network
devices' modules from being loaded until the user has made the decision about
whether to enable MAC spoofing or not. The way we do this is by
generating a list of all network device modules during build time, and
-add these to a `modprobe.d`-type blacklist. In Tails Greeter's
+add these to a `modprobe.d`-type blacklist. An implication of this is
+that in-kernel drivers and modules installed after build time will not
+be in the blacklist and hence are not supported. In Tails Greeter's
post-login script (when we know the user's decision) we unblock the
network by simply removing that list, and then we have udev "re-probe"
for network devices and load their modules.
@@ -340,7 +316,9 @@ Scripts:
build time)
* [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-unblock-network]]
- (runs right after Tails Greeter logs in)
+
+* [[!greeter_gitweb PostLogin.default]] (where `tails-unblock-network`
+ is started)
### Potential for blocking the desktop
@@ -400,6 +378,31 @@ the future it's a simple task.
Helper scripts:
[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-spoof-mac]]
+## MAC spoofing fail safe
+
+For any network device, the MAC address is recorded both before and
+after the actual MAC spoofing. If the values are equal, or if they
+could not be obtained, we fail closed by going into "panic mode" for
+the device. This means that the device is `down`:ed, and its module is
+unloaded and blacklisted. If the network device's interface still
+exists after this, networking is completely disabled by shutting down
+NetworkManager. The user is notified of which device was the culprit,
+and whether the module was unloaded, or if the network was completely
+disabled.
+
+Note that we treat the perfectly fine `macchanger` behaviour of
+randomly picking the real MAC address as a failure. Since we randomise
+the lower 3 bytes of the MAC address there's a `1/2^24` chance for
+this happening for each device. To make it a bit less frequent (!) we
+repeat the MAC spoofing until a new address is obtained, with up to
+three tries. Theoretically speaking this leaks up to `24/2^24` bits of
+the lower 3 bytes of the real MAC address per Tails session, which in
+practice is much less of a problem than randomly "spoofing" to the
+real MAC address.
+
+Script:
+[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-spoof-mac]]
+
## Connection failure detection
This section deals with AvoidConnectionProbs. The goal is to somehow
@@ -421,5 +424,9 @@ successfully distinguishes between MAC-spoof related errors and errors
when entering the wrong passphrase, so no false positives in that
(relatively common) case.
-For details, see the script:
-[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-blocked-network-detector]]
+Scripts:
+
+* [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector]]
+
+* [[!greeter_gitweb PostLogin.default]]
+ (`tails-restricted-network-detector` started from this script)
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index 0437906..9acaae0 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -170,6 +170,11 @@ Developers with write access to the repositories should instead:
git clone gitolite@git.puppet.tails.boum.org:puppet-tails
+### Other Puppet modules
+
+We use and publish a lot of other Puppet modules. See the section
+about our [[other repositories|git#other-repositories]].
+
### tails_lizard_manifests
Developers with access to the APT secrets can check it out like this:
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index 9f6fc33..dc81000 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -11,14 +11,10 @@ Welcome aboard! Please read-on.</p>
# Foreword
-## Why should I read this page?
-
-Every Free Software project is a bit different from the others. If you
-don't understand its development process, it is generally pretty hard
-for you to contribute in a way that is both efficient and joyful for
-you... and for its current core development team. This document is
-meant to help *you* understand what you need so that you can more
-efficiently and joyfully contribute to Tails.
+Every Free Software project is a bit different from the others.
+This page is meant to help you understand some basics of the Tails
+project, so that you can more efficiently and joyfully contribute
+to Tails.
## Focus on low-effort maintainability
@@ -35,39 +31,39 @@ Since the early days of this project (i.e. early 2009), ease of
maintenance in the long run has been a major factor in every decision
we have made. Nowadays Tails is more alive and kicking than it has
ever been, and we feel this would have been impossible without
- this kind of mindset.
+this mindset.
Our focus on low-effort maintainability has practical consequences.
First of all, we tend to **carry the smallest possible delta** with
-our upstreams (i.e. upstream software, the Debian distribution, and
-the Debian Live build tools). Pretty important details about this can
-be found in our [[contribute/relationship_with_upstream]] statement
-rather than repeated here.
+our upstreams (i.e. upstream software and Debian). For details about
+this, read our [[contribute/relationship_with_upstream]] statement.
+Moreover, we encourage you to [[improve Tails by working on
+Debian|contribute/how/debian]].
-Second, we try **not to reinvent the wheel** too often, and flee the
-*Not-Invented-Here* syndrome like the plague. This implies very little
+Second, we try **not to reinvent the wheel**, and we flee the
+[[!wikipedia Not_invented_here]] syndrome like the plague. Very little
code is actually written specifically for Tails: most of what we call
*code work* on Tails is more similar to system administration than it
-is to programming: we mainly glue existing pieces together; when we
-happen to need a feature that no software provides yet, we tend to
-pick the best existing tool and do whatever is needed to get the
-needed feature upstream... which may, or may not, be writing a patch
-ourselves.
+is to programming. We glue existing pieces together. When we need
+a feature that no software provides yet, we tend to pick the best
+existing tool, and do whatever is needed to get the needed feature
+upstream... which sometimes implies to write a patch ourselves.
# How to get started
## Pick up a task
-This wiki is used as a basic bug tracking system: we use it to manage
-our todo and bugs lists as well as our [[!tails_roadmap]].
-If you already know which one of the listed tasks you want to fulfill
-and it *only* has the *Code* Type of work, you can probably safely skip to
-the next section.
+We use [[!tails_redmine "" desc="Redmine"]] to manage
+our lists of tasks and bugs, as well as our [[!tails_roadmap]].
+If you already know which one of the listed tasks you want to tackle
+and it has the *Code* Type of work, then you can probably
+safely skip to the next section.
So you want to contribute code to Tails but do not know where to
-start? Our [[!tails_redmine "" desc="TODO list"]] is huge and
-frightening, but...
+start? Our coding [TODO
+list](https://labs.riseup.net/code/projects/tails/issues?query_id=119)
+is huge and frightening, but...
*Do not panic!*
@@ -83,90 +79,81 @@ Let's see how we can help you picking up a task. A few tips:
it does not require deep knowledge of the Tails internals.
On the one hand, you may want to **start doing practical stuff
-immediately**. In this case, see on the [[!tails_redmine ""
-desc="TODO"]] list the tasks that have the `Code`
-*Type of work* set. You probably want to start looking
+immediately**. In this case, see [list the tasks that have the `Code`
+*Type of
+work*](https://labs.riseup.net/code/projects/tails/issues?query_id=119)
+set. You probably want to start looking
at the few ones that are also in the [[!tails_redmine_easy]]
first so that you can gain confidence and we can smoothly learn to
work together.
On the other hand, you may prefer **picking up a task that requires
some initial thought and discussion** before rushing to your
-`$EDITOR`. In this case, you probably want to look at the [[providing
-needed input guidelines|contribute/how/input]].
+`$EDITOR`. In this case, you probably want to look at the [[guidelines
+for providing needed input|contribute/how/input]].
## Get in touch with our past, present and future
So you know what bug you want to fix, what feature you want to
-implement.
-
-Duplicated, unfinished or otherwise unusable work makes us sad, so
-unless you are sure it is really easy you should:
-
-1. **Gather results of previous research and discussions.** Search
- this wiki and the [developers mailing-list
- archive](https://boum.org/mailman/pipermail/tails-dev) for previous
- discussions on the topic you are interested in; [[!tails_todo
- usb_install_and_upgrade desc="some"]] [[!tails_todo tasks
- macchanger desc="tasks"]] are much harder to get right than one
- could initially expect, and you'd better see how difficult it is to
- implement what you want.
-2. **[[Tell us|contribute/talk]] about your plans.** This helps making sure
- your idea fits nicely into the [[big picture|contribute/design]]
- and nobody is currently working on the same task.
+implement. At this point, we advise you to:
+
+1. **Gather results of previous research and discussions** on the
+ topic you are interested in. Search this wiki, [[!tails_redmine ""
+ desc="tickets on Redmine"]] and the [developers mailing-list
+ archive](https://mailman.boum.org/pipermail/tails-dev/).
+2. **[[Tell us|contribute/talk]] about your plans** to make sure your
+ idea fits nicely into the [[big picture|contribute/design]], and
+ nobody is currently working on the same task.
# Hack
-Tails is developed using a set of [[Git repositories|contribute/git]]. You
-probably want to base your work on the `devel` branch. If unsure, feel
-free to ask us.
+Tails is developed using a set of [[Git repositories|contribute/git]].
+If unsure, base your work on the `devel` branch, or ask.
-Please think of how you will actually submit your work to us
-**before** you have changed 20 files for 10 different reasons ;) In
-other words, every commit shall implement one change and be labelled
-with a commit message that clearly expresses the rationale of your
-changes. This is needed so that we can review your work
-without too much difficulty: just explain every proposed change to us
-(almost) the same way as if you would explain it to anyone who lacks
-the background.
+Every commit shall implement one change and be labeled with a commit
+message that clearly expresses the rationale of your changes. This is
+needed so that your work can be easily reviewed: explain every
+proposed change to us in the same way you would explain it to someone
+who would not get the background.
# Submit your work
-Before diving into technical details please consider reading our
-(quite short) [[contribute/merge policy]].
+Before diving into technical details, please read our
+[[contribute/merge policy]].
You can submit small, easy changes as Git patches (prepared with the
`git format-patch` command) over [[email|contribute/talk]].
-For bigger, harder changes that will might require a few review/fix
-cycles before being merged in, it's better if you ask us to review and
-pull your work from a dedicated Git topic branch. If you already know
-where to host your personal repository in a public online place, this
-is great; or else you may want to [fork us on
-repo.or.cz](http://repo.or.cz/w/tails.git).
-
-FIXME: mob branch on repo.or.cz? mob repository where anyone can
-create and push `feature/*` and `bugfix/*` branches?
+For larger changes that will certainly require a few review/fix cycles
+before being merged, it's better if you push your work to a dedicated
+Git topic branch, and ask us to review it. If you already know where
+to host your personal repository in a public online place, this is
+great; otherwise, you can [fork us on
+repo.or.cz](http://repo.or.cz/w/tails.git), or ask the [Tails system
+administrators](tails-sysadmins@boum.org) to host your repository.
# Want more?
+Still here? Good, please read on.
+
+## Read about Tails design
+
+The [[specification and design document|contribute/design]] will help
+you understand better how Tails works.
+
## Follow Tails development
-Still here? Well, it seems you're not the
-*patch-in-a-hurry-and-then-forget* type.
+You should subscribe to the [tails-dev mailing
+list](https://mailman.boum.org/listinfo/tails-dev).
-Then you probably want to subscribe to the [tails-dev mailing
-list](https://boum.org/mailman/listinfo/tails-dev/). Maybe even
-subscribe to this website's RSS feed (see the [[recentchanges]] page)
-and/or track the Git commits (using [[our Gitweb|contribute/git]]'s RSS
-features). And probably read Tails [[specification and security design
-document|contribute/design]].
+You can also subscribe to this website's RSS feed (see
+[[recentchanges]]) and track the Git commits (using [[our
+Gitweb|contribute/git]]'s RSS features).
-## Building images
+## Build a Tails ISO
-You probably want to test your changes before contributing them back;
-this may require you to [[build an ISO image|contribute/build]]. This step is
-also needed if you need to [[contribute/customize]] Tails.
+You should test your changes before contributing them back.
+Most often, this requires you to [[build an ISO image|contribute/build]].
# Talk to us
diff --git a/wiki/src/contribute/how/debian.mdwn b/wiki/src/contribute/how/debian.mdwn
new file mode 100644
index 0000000..0895241
--- /dev/null
+++ b/wiki/src/contribute/how/debian.mdwn
@@ -0,0 +1,51 @@
+[[!meta title="Improve Tails by working on Debian"]]
+
+<div id="intro">
+
+<p>So you want to help Tails by working on Debian.
+Welcome aboard! Please read-on.</p>
+
+[[!toc levels=1]]
+
+</div>
+
+# Foreword
+
+Our [[contribute/relationship_with_upstream]] statement defines our
+relationship with Debian.
+
+# Tasks
+
+* Work on the [[Debian bugs that affect
+ Tails|contribute/relationship_with_upstream#debian-bts]].
+* Maintain backports for Wheezy: [[!debpts i18nspector]], [[!debpts
+ monkeysign]], [[!debpts seahorse-nautilus]], [[!debpts poedit]],
+ [[!debpts pidgin]], [[!debpts liferea]], [[!debpts redmine]],
+ [[!debpts ruby-passenger]], [[!debpts ruby-rjb]], etc.
+* Join us to maintain [[!debpts mat]], [[!debpts libgsecuredelete]],
+ [[!debpts nautilus-wipe]], [[!debpts torsocks]] and [[!debpts
+ vidalia]].
+* Join the [Debian OTR Team](https://wiki.debian.org/Teams/OTR), that
+ maintains [[!debpts pidgin-otr]], [[!debpts libotr]], and more.
+* Help [improving Debian's AppArmor
+ support](https://wiki.debian.org/AppArmor).
+* Help maintain [[!debpts ruby-libvirt]] in Debian, including
+ up-to-date wheezy-backports.
+* Maintain the Xorg stack in wheezy-backports (at least the
+ foundations and the major drivers).
+* Turn our OpenPGP applet into an independent upstream project,
+ and package it for Debian ([[!tails_ticket 6507]]).
+* Package Cryptocat for Debian, in the hope that someone integrates it
+ in Tails later on ([[!tails_ticket 5484]]).
+* Set up automated QA of [Debian Live](http://live.debian.net/)
+ development branches, and/or change the workflow of this project so
+ that one can backport improvements into the stable branches.
+
+# Want more?
+
+You might want to subscribe to the [tails-dev mailing
+list](https://mailman.boum.org/listinfo/tails-dev).
+
+# Talk to us
+
+[[!inline pages="contribute/talk" raw="yes"]]
diff --git a/wiki/src/contribute/how/input.mdwn b/wiki/src/contribute/how/input.mdwn
index 7379c68..1a344ad 100644
--- a/wiki/src/contribute/how/input.mdwn
+++ b/wiki/src/contribute/how/input.mdwn
@@ -8,8 +8,9 @@ to contribute to this effort.
who lack the technical skills needed to actually implement the desired
feature.
-Tasks that are currently stalled by the need for input are listed in
-the *Research*, *Discuss*, *QA* and *Test* categories of the [[!tails_redmine "" desc="TODO"]] list.
+Tasks that are currently stalled by the need for input have the
+the `Research`, `Discuss`, or `Test` *Type of work* on our
+[[!tails_redmine "" desc="TODO"]] list.
You probably want to start looking at the ones that are also in the
[[!tails_redmine_easy]] first so that you can gain confidence...
and we can smoothly learn to work together.
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index cd3907f..cc49e79 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -46,7 +46,7 @@ BitTorrent|contribute/how/mirror/automatically_download_and_seed_Tails_over_BitT
Else, new versions are announced on:
* our [news
- mailing-list](https://boum.org/mailman/listinfo/amnesia-news)
+ mailing-list](https://mailman.boum.org/listinfo/amnesia-news)
* our <a href='/torrents/rss/index.rss'>RSS</a> and
<a href='/torrents/rss/index.atom'>Atom</a> feeds that announce new available
BitTorrent files.
diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn
index c7e76b2..4f02d1b 100644
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -41,6 +41,8 @@ Greeter](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-
- [Tails Persistence
Setup](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-persistence-setup-pot/)
- [Tails Installer](https://www.transifex.com/projects/p/torproject/resource/3-tails-liveusb-creator-pot/)
+- [Tails Upgrader](https://www.transifex.com/projects/p/torproject/resource/tails-tails-iukpot/)
+- [Tails Perl library](https://www.transifex.com/projects/p/torproject/resource/tails-tails-perl5lib/)
- [WhisperBack](https://www.transifex.com/projects/p/torproject/resource/3-whisperback-whisperback-pot/)
- [A set of various translatable strings](https://www.transifex.com/projects/p/torproject/resource/tails-misc/)
@@ -59,7 +61,7 @@ Further:
<a id="git"></a>
**For each custom program**, you can download the PO files via
-[[Transifex|translate#transifex]] or gitweb:
+[[Transifex|translate#transifex]] or the Git web interface:
- Tails Greeter:
[PO files](https://git-tails.immerda.ch/greeter/tree/po),
@@ -69,15 +71,19 @@ translators](https://git-tails.immerda.ch/greeter/plain/README.translators)
[PO files](https://git-tails.immerda.ch/persistence-setup/tree/po)
- Tails Installer:
[PO files](https://git-tails.immerda.ch/liveusb-creator/tree/po)
+ - Tails Upgrader:
+ [PO files](https://git-tails.immerda.ch/iuk/tree/po)
+ - Tails Perl library:
+ [PO files](https://git-tails.immerda.ch/perl5lib/tree/po)
- WhisperBack:
[PO files](https://git-tails.immerda.ch/whisperback/tree/po),
see also the [README for
translators](https://git-tails.immerda.ch/whisperback/plain/README.translators)
- Some smaller programs written for Tails: [[!tails_devel_gitweb_dir po desc="PO files"]]
-**For the website**, you can browse its [source code via
-gitweb](https://git-tails.immerda.ch/tails/tree/wiki/src)
-as well. Each page is translated in a specific PO file.
+**For the website**, you can browse its [source code via the Git web
+interface](https://git-tails.immerda.ch/tails/tree/wiki/src) as well.
+Each page is translated in a specific PO file.
If there is no existing PO file for your language, you can copy and rename the
corresponding
@@ -102,10 +108,10 @@ Here are a couple of links to get started with Git:
Various bits of texts can be translated:
* **Custom programs** (Tails Greeter, Tails Persistence Setup, Tails
- Installer and WhisperBack): each one has its own [[Git
- repository|contribute/git]], where PO files live in the `po`
- directory. Some have a `README.translators` at the root of their
- source tree: please read it.
+ Installer, Tails Upgrader, Tails Perl library and WhisperBack): each
+ one has its own [[Git repository|contribute/git]], where PO files
+ live in the `po` directory. Some have a `README.translators` at the
+ root of their source tree: please read it.
* **A set of various translatable strings** live in the `po`
directory, in the `devel`
branch of the [[main Tails Git repository|contribute/Git]].
@@ -135,9 +141,11 @@ You can take advantage of Git to send us your work by asking us to
pull from your Git branch. Here is the typical workflow used by Tails
translators teams:
-1. Set up your personal [[Git repository|contribute/git]]: if you already know
- where to host it in a public place, this is great; or else [fork us
- on repo.or.cz](http://repo.or.cz/w/tails.git).
+1. Set up your personal [[Git repository|contribute/git]]: if you
+ already know where to host it in a public place, this is great;
+ else, [fork us on repo.or.cz](http://repo.or.cz/w/tails.git) or ask
+ the [Tails system administrators](tails-sysadmins@boum.org) to host
+ your repository.
2. Translate whatever you can in your preferred PO file editor.
3. Commit the changes you made to `.po` files.
4. Merge our main repository into yours.
@@ -237,7 +245,7 @@ You can consult this
[archive](https://mailman.boum.org/pipermail/tails-l10n/) to search
for recent translation requests.
-See also the `Translation` *Type of work*
+See also the tickets with the `Translate` *Type of work*
[[!tails_redmine "" desc="on Redmine"]].
# Resources
diff --git a/wiki/src/contribute/l10n_tricks/check_po.sh b/wiki/src/contribute/l10n_tricks/check_po.sh
index 3433ffb..1446104 100755
--- a/wiki/src/contribute/l10n_tricks/check_po.sh
+++ b/wiki/src/contribute/l10n_tricks/check_po.sh
@@ -20,6 +20,7 @@ boilerplate-in-last-translator
boilerplate-in-project-id-version
conflict-marker-in-header-entry
fuzzy-header-entry
+incorrect-plural-forms
invalid-content-transfer-encoding
invalid-date
invalid-language
diff --git a/wiki/src/contribute/meetings/201402.mdwn b/wiki/src/contribute/meetings/201402.mdwn
new file mode 100644
index 0000000..a4b465c
--- /dev/null
+++ b/wiki/src/contribute/meetings/201402.mdwn
@@ -0,0 +1,93 @@
+[[!meta title="February 2014 online meeting"]]
+
+Agenda
+======
+
+* Investigate dropping the Cookie Monster browser extension
+ ([[!tails_ticket 6595]])
+* Persistent folder should not be writable with read-only persistence
+ ([[!tails_ticket 6585]])
+* Volunteers to handle broken windows this month
+* Planning a monthly low-hanging fruits or review'n'merge meeting
+
+Investigate dropping the Cookie Monster browser extension
+---------------------------------------------------------
+
+See [[!tails_ticket 6595]].
+
+Decision: intrigeri pinged the thread on -dev, as we lack inputs of use cases
+for this discussion.
+
+Persistent folder should not be writable with read-only persistence
+-------------------------------------------------------------------
+
+See [[!tails_ticket 6585]].
+
+Decision: add a note on the ticket, saying we agreed here that this doesn't look
+like a bug. Then, unless the discussion is (re)started on tails-dev, we'll close
+the ticket after next month's meeting
+
+Create a logo for Tails
+-----------------------
+
+See [[!tails_ticket 5797]].
+
+BitingBird updated the ticket with the clarification that we discussed:
+
+* The logo has to be published under a free licence, compatible with GPL3+
+* Proportions: ratio between 1:1 and 3:1
+* If writing, then: Tails (uppercase first letter, the rest in lowercase)
+* Colors: until now we stole the purple+green from Tor, but it doesn't have to
+* rather not re-use tor/debian images, but evoking ok (tor colors...)
+* Visual + idea: secrecy / privacy / anonymity / mystery ; simplicity: tails is
+* ready-to-use
+* little bit serious, but not sad
+* The logo should make nice stickers / t-shirts, that people want to have on
+ their computers or themselves
+* We like the idea of the tail, the cat or the mask that was used by Incognito
+ in the past. Other ideas that meet the requirements are welcome too.
+
+Volunteers to handle broken windows this month
+----------------------------------------------
+
+### Introduction
+
+Our "broken windows" (https://tails.boum.org/contribute/roadmap/#Broken%20window),
+are tasks or issues that, ideally,
+should have been resolved a while ago, and seeing them still causing
+problems is demotivating.
+
+We try to spend a week focusing on broken windows each month.
+Recently, most core contributors have been focusing on broken windows
+all the time, so we skipped them in practice.
+
+However, if new contributors want to play with us, it may make sense
+to revive these specific times.
+
+### Decisions
+
+Sajolida will send an email to Kevin about Tails clock.
+
+
+Monthly low-hanging fruits meeting
+----------------------------------
+
+### Introduction
+
+Low-hanging fruits meeting: spend a while together on many small tasks
+that take less than 2 hours each, and are waiting in our TODO list for
+too long.
+
+During these meetings, we exceptionally allow ourselves to do the
+review & merge process on IRC instead of the usual email -based
+workflow, so this should all go pretty smoothly. Then, we report back
+on tails-dev.
+
+We also use these meetings to review stuff that's waiting in
+the queue.
+
+### Decisions
+
+Next LHF session will take place on the 24th february, from 10AM to 2PM CET.
+It will be more oriented on hard testing of new features, as the freeze for 0.23
+will be close, and there will be big new ones.
diff --git a/wiki/src/contribute/relationship_with_upstream.mdwn b/wiki/src/contribute/relationship_with_upstream.mdwn
index 3ee8716..12c75e4 100644
--- a/wiki/src/contribute/relationship_with_upstream.mdwn
+++ b/wiki/src/contribute/relationship_with_upstream.mdwn
@@ -38,10 +38,15 @@ Debian offers great amounts of flexibility to derivative developers,
so we seldom need to modify Debian-specific parts of the software we
ship. In the rare cases we need to:
-- we at least inform the concerned Debian maintainers of our needs to
- give them a chance to enhance their packages to fit our needs, e.g.
- by adding debconf options,
-- we intend to try to do this ourselves and submit patches to Debian.
+- we at least inform the relevant Debian maintainers, so that they
+ have a chance to enhance their packages to fit our needs;
+- in many cases, we write and propose patches that would allow us to
+ install unmodified Debian packages in Tails.
+
+We also encourage potential contributors to [[improve Tails by working
+on Debian|contribute/how/debian]].
+
+<a id="debian-bts"></a>
### Debian Bug tracking system
@@ -49,14 +54,14 @@ We file and contribute to RFP and WNPP bugs so that software we need
lands in Debian. More generally, we heavily use the Debian
infrastructure such as the [BTS](http://bugs.debian.org/).
-We use usertags ([documentation](http://wiki.debian.org/bugs.debian.org/usertags)),
+We use usertags ([documentation](http://wiki.debian.org/bugs.debian.org/usertags),
[reporting](http://www.debian.org/Bugs/Reporting)) to track bugs we
are interested in on the Debian BTS.
See the full and up-to-date list of bugs:
-* [sorted by usertag](http://udd.debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org)
-* [sorted by severity](http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org)
+* [sorted by usertag](http://udd.debian.org/cgi-bin/bts-usertags.cgi?user=tails-dev@boum.org);
+* [sorted by severity](http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=tails-dev@boum.org).
**Warning**: do **not** use tags that are already [defined
globally](https://www.debian.org/Bugs/Developer#tags) on the BTS.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 3698bb9..9f6a102 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -234,8 +234,11 @@ If at freeze time:
the website [[using `check_po.sh`|contribute/l10n_tricks]], and
corrects all the errors.
2. Send a call for translations to tails-l10n, making it clear what
- Git branch the translations must be based on, and what are
- the priorities.
+ Git branch the translations must be based on, and what are the
+ priorities. Also, add a few words to remember the translation teams
+ using Git that they should regularly contact Transifex translators,
+ as detailed on the [[documentation for
+ translators|contribute/how/translate]].
Tag the release in Git
======================
diff --git a/wiki/src/contribute/release_process/perl5lib.mdwn b/wiki/src/contribute/release_process/perl5lib.mdwn
index faff249..9521166 100644
--- a/wiki/src/contribute/release_process/perl5lib.mdwn
+++ b/wiki/src/contribute/release_process/perl5lib.mdwn
@@ -36,41 +36,39 @@ Export new upstream version number:
export VERSION=XXX
-Update version number in `bin/tails-persistence-setup`:
-
- perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' lib/Tails.pm
- perl -pi -E "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," lib/Tails.pm
-
-Commit all files that need to be:
-
- git commit lib/Tails.pm -m "Tails-perl5lib $VERSION"
-
-Run the upstream test suite:
-
- RELEASE_TESTING=1 dzil test
-
-Build an upstream tarball and tag the release:
-
- dzil build && git tag -s "Tails-perl5lib_$VERSION" -m "Tails-perl5lib $VERSION"
-
-Move the tarball out of the build repository and delete the build directories:
-
- mv Tails-perl5lib-*.tar.gz .. && rm -rf Tails-perl5lib-* .build
+Update version number in `bin/tails-persistence-setup`, commit all
+files that need to be, run the upstream test suite, build an upstream
+tarball, tag the release, move the tarball out of the build repository
+and clean it up:
+
+ perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' lib/Tails.pm && \
+ perl -pi \
+ -E "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," \
+ lib/Tails.pm && \
+ git commit lib/Tails.pm -m "Tails-perl5lib $VERSION" && \
+ RELEASE_TESTING=1 dzil test && \
+ dzil build && \
+ git tag -s "Tails-perl5lib_$VERSION" -m "Tails-perl5lib $VERSION" && \
+ mv Tails-perl5lib-*.tar.gz .. && \
+ git clean -fdx
Update the Debian package
=========================
-Checkout the branch with Debian package specifics and import the new upstream tarball:
+Checkout the branch with Debian package specifics, import the new
+upstream tarball, update `debian/changelog`:
git checkout debian && \
- git-import-orig --upstream-vcs-tag=Tails-perl5lib_$VERSION ../Tails-perl5lib-$VERSION.tar.gz
-
-Update `debian/changelog`:
-
- git-dch && dch -e
+ git-import-orig --upstream-vcs-tag=Tails-perl5lib_$VERSION \
+ ../Tails-perl5lib-$VERSION.tar.gz && \
+ git-dch --auto && \
+ dch -e
(Do not forget to set the appropriate release.)
+Update the packaging (e.g. look at changes in `dist.ini`),
+and then update `debian/changelog` again if needed.
+
Commit `debian/changelog`:
git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
@@ -83,7 +81,7 @@ If everything is fine, add a signed tag to the repository and push the
changes:
git-buildpackage --git-tag-only --git-sign-tags && \
- git push && git push --tags
+ git push && git push --tags
(Make sure `master`, `upstream`, `debian` and `pristine-tar` were all pushed.)
diff --git a/wiki/src/contribute/release_process/tails-greeter.mdwn b/wiki/src/contribute/release_process/tails-greeter.mdwn
index 8feb9d0..42518ba 100644
--- a/wiki/src/contribute/release_process/tails-greeter.mdwn
+++ b/wiki/src/contribute/release_process/tails-greeter.mdwn
@@ -4,6 +4,16 @@
[[!toc levels=1]]
+Update POT and PO files
+=======================
+
+ ./setup.py build_i18n && \
+ (cd po && \
+ for po in *.po ; do msgmerge --update "$po" \
+ tails-greeter.pot ; done \
+ ) && \
+ git commit po -m 'Update POT and PO files.'
+
Update the Debian package
=========================
@@ -27,7 +37,7 @@ Build a new Debian package (use a Squeeze/i386 chroot):
If everything is fine, tag the release and push the changes:
- git-buildpackage --git-tag-only --git-sign-tags --git-keyid=$PGP_PUB_KEY
+ git-buildpackage --git-tag-only --git-sign-tags --git-keyid=$PGP_PUB_KEY && \
git push && git push --tags
Add the Debian package to Tails
diff --git a/wiki/src/contribute/release_process/tails-iuk.mdwn b/wiki/src/contribute/release_process/tails-iuk.mdwn
index 95cc102..7efd6e9 100644
--- a/wiki/src/contribute/release_process/tails-iuk.mdwn
+++ b/wiki/src/contribute/release_process/tails-iuk.mdwn
@@ -18,16 +18,14 @@ Export new upstream version number:
export VERSION=XXX
-Update version number in `bin/tails-create-iuk`.
+Update version number in `bin/tails-create-iuk`, commit all files that
+need to be.
- perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' bin/tails-create-iuk
- perl -pi -E \
- "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," \
- bin/tails-create-iuk
-
-Commit all files that need to be:
-
- git commit bin/tails-create-iuk -m "tails-iuk $VERSION"
+ perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' bin/tails-create-iuk && \
+ perl -pi -E \
+ "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," \
+ bin/tails-create-iuk && \
+ git commit bin/tails-create-iuk -m "tails-iuk $VERSION"
Run the upstream test suite (point `PERL5LIB` to a checkout of the
relevant tag of Tails' perl5lib):
@@ -41,7 +39,7 @@ relevant tag of Tails' perl5lib):
# for each $FEATURE in features/* :
LC_ALL=C PERL5LIB=/home/user/tails/perl5lib/lib pherkin $FEATURE
# ... and manually cleanup mounted filesystems and busy loopback
- # devices left behind between each run, sorry :(
+ # devices left behind between each run of some features, sorry :(
# Run the rest of the test suite
RELEASE_TESTING=1 LC_ALL=C PERL5LIB=/home/user/tails/perl5lib/lib dzil test
@@ -51,26 +49,25 @@ the build repository and cleanup:
dzil build && \
git tag -s $VERSION -m "tails-iuk $VERSION" && \
- mv Tails-IUK*.tar.gz .. && rm -rf Tails-IUK-* .build po/*.mo
+ mv Tails-IUK*.tar.gz .. && git clean -fdx
Update the Debian package
=========================
Checkout the branch with Debian package specifics and import the new
-upstream tarball:
+upstream tarball, update `debian/changelog`:
git checkout debian && \
- git-import-orig --upstream-vcs-tag=$VERSION ../Tails-IUK-$VERSION.tar.gz
-
-Update the packaging (e.g. look at changes in `dist.ini`).
-
-Update `debian/changelog`, starting with `git-dch` if the last step
-did not do it:
-
- dch
+ git-import-orig --upstream-vcs-tag=$VERSION \
+ ../Tails-IUK-$VERSION.tar.gz && \
+ git-dch --auto && \
+ dch -e
(Do not forget to set the appropriate release.)
+Update the packaging (e.g. look at changes in `dist.ini`),
+and then update `debian/changelog` again if needed.
+
Commit `debian/changelog`:
git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index c6ff5ef..a0a5557 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -372,7 +372,7 @@ process that is worth [[a dedicated page|test/erase_memory_on_shutdown]].
# I2P
* Make sure that I2P is up-to-date, at least if the
- [changelogs](http://www.i2p2.de/announcements.html) mention that
+ [changelogs](https://geti2p.net/announcements.html) mention that
security critical bugs were fixed.
* Check that "Applications -> Internet -> I2P" works:
- You get the "Starting I2P..." pop-up.
@@ -384,7 +384,7 @@ process that is worth [[a dedicated page|test/erase_memory_on_shutdown]].
non-zero.
- You should get "Network: Hidden" in the "General" section.
* Check that you can reach some eepsites within Iceweasel, like
- <http://www.i2p2.i2p> and <http://forum.i2p>.
+ <http://i2p-projekt.i2p> and <http://forum.i2p>.
* Check that you can connect to the I2P IRC server through Pidgin and
the preconfigured IRC account on 127.0.0.1.
diff --git a/wiki/src/contribute/release_process/test/automated_tests.mdwn b/wiki/src/contribute/release_process/test/automated_tests.mdwn
index ac2e498..ab669fa 100644
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
@@ -206,19 +206,6 @@ All these should be pretty obvious. It could be mentioned that the
last two steps, like many others, depend on the remote shell to
be working.
- And Iceweasel has autostarted and is not loading a web page
-
-Since Tor is working, Iceweasel will autostart. We stop if from
-loading the home page because that generally will break later if we
-use a background snapshot.
-
- And I have killed the process "iceweasel"
-
-If we want to test some application other than Iceweasel, we want to
-make sure that Iceweasel is not running, and hence in the way. This
-and the previous step makes sure that it won't appear from the blue,
-blocking that application.
-
And the time has synced
If we want to use hidden services, we must make sure we have a
diff --git a/wiki/src/contribute/talk.html b/wiki/src/contribute/talk.html
index 2ab9f82..ee319e2 100644
--- a/wiki/src/contribute/talk.html
+++ b/wiki/src/contribute/talk.html
@@ -11,11 +11,11 @@
and headers reveal about yourself: location, IP address, etc.;
</li>
<li>
- you may want to join our [[#tails|support/chat]] and
- [[#tails-dev|contribute/chat]] chatrooms; note: a small
- subset of Tails core developers hang out there, so asynchronous
- communication means are to be preferred for anything that might be of some
- interest for the whole Tails development community;
+ you can join our [[#tails|support/chat]] and
+ [[#tails-dev|contribute/chat]] chatrooms; note: only a few
+ Tails core developers hang out there, so email
+ is preferred for anything that might be of
+ interest for the larger Tails development community;
</li>
<li>
for <emph>translation-related matters</emph>, you can
@@ -30,6 +30,6 @@
<p>
For matters that need to be hidden from the public eyes, email
the private development mailing list: <a href='mailto:tails@boum.org'>tails@boum.org</a>;
- to achieve end-to-end encryption, encrypt such email with our [[OpenPGP key|doc/about/openpgp_keys]].
+ to achieve end-to-end encryption, encrypt such email with [[our OpenPGP key|doc/about/openpgp_keys]].
</p>
diff --git a/wiki/src/contribute/working_together/Redmine.mdwn b/wiki/src/contribute/working_together/Redmine.mdwn
index 5fc1e35..c1a7e25 100644
--- a/wiki/src/contribute/working_together/Redmine.mdwn
+++ b/wiki/src/contribute/working_together/Redmine.mdwn
@@ -1,5 +1,9 @@
Tails tasks are managed in a [[!tails_redmine "" desc="Redmine project"]].
+You need the CAcert.org root CA installed in your web browser.
+On Debian systems, get it from `/etc/ssl/certs/cacert.org*.pem`.
+Else, get it from the [CAcert.org website](http://www.cacert.org/).
+
If you need to do something in Redmine, but you appear to lack the
needed credentials, please ask <tails-sysadmins@boum.org> to give you
more power.
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 61841d0..d00f7a2 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -36,7 +36,7 @@ Networking
* [Liferea](http://liferea.sourceforge.net/) feed aggregator
* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing
* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing
-* [I2P](http://www.i2p2.de/) an anonymizing network
+* [I2P](https://geti2p.net/) an anonymizing network
Desktop Edition
---------------
diff --git a/wiki/src/doc/about/requirements.de.po b/wiki/src/doc/about/requirements.de.po
index d94e180..58de260 100644
--- a/wiki/src/doc/about/requirements.de.po
+++ b/wiki/src/doc/about/requirements.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:48+0300\n"
+"POT-Creation-Date: 2014-02-27 09:53+0100\n"
"PO-Revision-Date: 2014-01-08 23:27+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,9 +21,13 @@ msgid "[[!meta title=\"System requirements\"]]\n"
msgstr "[[!meta title=\"Systemvoraussetzungen\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails should work on any reasonably recent PC computer, say manufactured "
+#| "after 2005. Here is a detailed list of requirements:"
msgid ""
-"Tails should work on any reasonably recent PC computer, say manufactured "
-"after 2005. Here is a detailed list of requirements:"
+"Tails should work on any reasonably recent computer, say manufactured after "
+"2005. Here is a detailed list of requirements:"
msgstr ""
"Tails sollte auf so gut wie jedem PC laufen, der halbwegs aktuell ist (d.h. "
"jünger als 10 Jahre). Folgende Voraussetzungen muss der Rechner jedoch "
@@ -38,12 +42,20 @@ msgstr ""
"USB-Stick oder einer SD-Karte **zu booten**."
#. type: Bullet: '- '
+#, fuzzy
+#| msgid ""
+#| "Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
+#| "compatible processor: **<span class=\"definition\">[[!wikipedia "
+#| "IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
+#| "\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!"
+#| "wikipedia ARM]]</span>."
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>."
+"ARM]]</span>. Mac computers are IBM PC compatible nowadays but still "
+"[[slightly supported by Tails|support/known_issues/#index2h2]]"
msgstr ""
"Tails benötigt einen Prozesor, der auf der <span class=\"definition\">[[!"
"wikipedia_de x86 desc=\"x86-Architektur\"]]</span> beruht. Deshalb läuft es "
diff --git a/wiki/src/doc/about/requirements.fr.po b/wiki/src/doc/about/requirements.fr.po
index e4c54cf..9f4979e 100644
--- a/wiki/src/doc/about/requirements.fr.po
+++ b/wiki/src/doc/about/requirements.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-02-27 09:53+0100\n"
"PO-Revision-Date: 2013-10-28 19:03-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,9 +22,13 @@ msgid "[[!meta title=\"System requirements\"]]\n"
msgstr "[[!meta title=\"Configuration requise\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails should work on any reasonably recent PC computer, say manufactured "
+#| "after 2005. Here is a detailed list of requirements:"
msgid ""
-"Tails should work on any reasonably recent PC computer, say manufactured "
-"after 2005. Here is a detailed list of requirements:"
+"Tails should work on any reasonably recent computer, say manufactured after "
+"2005. Here is a detailed list of requirements:"
msgstr ""
"Tails devrait pouvoir marcher sur n'importe quel PC relativement récent, "
"disons produit après 2005. Voici la liste détaillée de la configuration "
@@ -39,12 +43,20 @@ msgstr ""
"**démarrer sur une clé USB ou une carte SD**."
#. type: Bullet: '- '
+#, fuzzy
+#| msgid ""
+#| "Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
+#| "compatible processor: **<span class=\"definition\">[[!wikipedia "
+#| "IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
+#| "\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!"
+#| "wikipedia ARM]]</span>."
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>."
+"ARM]]</span>. Mac computers are IBM PC compatible nowadays but still "
+"[[slightly supported by Tails|support/known_issues/#index2h2]]"
msgstr ""
"Tails nécessite un processeur compatible <span class=\"definition\">[[!"
"wikipedia x86]]</span> : **<span class=\"definition\">[[!wikipedia "
diff --git a/wiki/src/doc/about/requirements.mdwn b/wiki/src/doc/about/requirements.mdwn
index 0b20de8..1bb99df 100644
--- a/wiki/src/doc/about/requirements.mdwn
+++ b/wiki/src/doc/about/requirements.mdwn
@@ -1,6 +1,6 @@
[[!meta title="System requirements"]]
-Tails should work on any reasonably recent PC computer, say manufactured after 2005.
+Tails should work on any reasonably recent computer, say manufactured after 2005.
Here is a detailed list of requirements:
- Either **an internal or external DVD reader** or the possibility to **boot from a USB stick or SD card**.
@@ -8,6 +8,7 @@ Here is a detailed list of requirements:
compatible processor: **<span class="definition">[[!wikipedia
IBM_PC_compatible]]</span>** and others but not <span
class="definition">[[!wikipedia PowerPC]]</span> nor <span
- class="definition">[[!wikipedia ARM]]</span>.
+ class="definition">[[!wikipedia ARM]]</span>. Mac computers are IBM PC
+ compatible nowadays but still [[slightly supported by Tails|support/known_issues/#index2h2]]
- **1 GB of RAM** to work smoothly. Tails is known to work with less memory
but you might experience strange behaviours or crashes.
diff --git a/wiki/src/doc/about/requirements.pt.po b/wiki/src/doc/about/requirements.pt.po
index f0a802d..dbf5e05 100644
--- a/wiki/src/doc/about/requirements.pt.po
+++ b/wiki/src/doc/about/requirements.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:48+0300\n"
+"POT-Creation-Date: 2014-02-27 09:53+0100\n"
"PO-Revision-Date: 2012-07-03 16:46-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,9 +21,13 @@ msgid "[[!meta title=\"System requirements\"]]\n"
msgstr "[[!meta title=\"Requisitos de sistema\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails should work on any reasonably recent PC computer, say manufactured "
+#| "after 2005. Here is a detailed list of requirements:"
msgid ""
-"Tails should work on any reasonably recent PC computer, say manufactured "
-"after 2005. Here is a detailed list of requirements:"
+"Tails should work on any reasonably recent computer, say manufactured after "
+"2005. Here is a detailed list of requirements:"
msgstr ""
"Tails deve funcionar em qualquer computador pessoal razoavelmente recente, "
"digamos fabricado após 2005. Aqui está a lista detalhada de requisitos:"
@@ -41,12 +45,20 @@ msgstr ""
"USB** ou de um leitor USB externo de DVD."
#. type: Bullet: '- '
+#, fuzzy
+#| msgid ""
+#| "Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
+#| "compatible processor: **<span class=\"definition\">[[!wikipedia "
+#| "IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
+#| "\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!"
+#| "wikipedia ARM]]</span>."
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>."
+"ARM]]</span>. Mac computers are IBM PC compatible nowadays but still "
+"[[slightly supported by Tails|support/known_issues/#index2h2]]"
msgstr ""
"Tails requer um processador compatível com <span class=\"definition\">[[!"
"wikipedia x86]]</span>: **<span class=\"definition\">[[!wikipedia "
diff --git a/wiki/src/doc/anonymous_internet/i2p.mdwn b/wiki/src/doc/anonymous_internet/i2p.mdwn
index e2a6976..a8acff2 100644
--- a/wiki/src/doc/anonymous_internet/i2p.mdwn
+++ b/wiki/src/doc/anonymous_internet/i2p.mdwn
@@ -1,6 +1,6 @@
[[!meta title="Using I2P"]]
-[I2P](http://www.i2p2.de/) is an alternative anonymity network to Tor
+[I2P](https://geti2p.net/) is an alternative anonymity network to Tor
which supports most common Internet activities like web browsing,
email, filesharing etc. Unlike Tor, whose main focus arguably is on
accessing sites from the "normal" Internet, I2P is more oriented
@@ -9,7 +9,7 @@ towards being a closed [[!wikipedia darknet]], separate from the
so called Eepsite, that is only accessible within I2P using the `.i2p`
top level domain (similar to `.onion` for Tor hidden services). For
instance, the I2P homepage can also be accessed through I2P via
-<http://www.i2p2.i2p>.
+<http://i2p-projekt.i2p>.
I2P is not started by default in Tails, but can be started manually
throught the menu:
diff --git a/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po b/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
index 20020cd..7cb83fe 100644
--- a/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
@@ -88,7 +88,7 @@ msgid ""
"default (and only) search engine in the Navigation Toolbar. The lack of the "
"onion icon added by Torbutton is another such small visual reminder."
msgstr ""
-"Lorsque vous utilisez l'option [[Windows Camouflage|doc/first_steps/"
+"Lorsque vous utilisez l'option [[Windows camouflage|doc/first_steps/"
"startup_options/windows_camouflage]], le thème rouge est désactivé pour "
"éviter d'éveiller les soupçons. Il est toujours possible de différencier le "
"Navigateur Non-sécurisé par le fait que Wikipedia en anglais est le moteur de "
diff --git a/wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po b/wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po
index 11c31b2..739552b 100644
--- a/wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po
@@ -5,20 +5,20 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2013-10-14 17:42+0300\n"
-"PO-Revision-Date: 2012-01-28 18:51+0100\n"
+"PO-Revision-Date: 2014-02-27 10:04-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"
+"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Using the virtual keyboard\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Utiliser le clavier virtuel\"]]\n"
#. type: Plain text
#, no-wrap
@@ -28,6 +28,10 @@ msgid ""
"you type might be recorded by a hardware [[!wikipedia Keystroke_logging\n"
"desc=\"keylogger\"]].\n"
msgstr ""
+"Si vous pensez que l'ordinateur que vous utilisez n'est pas digne de confiance,\n"
+"par exemple s'il s'agit d'un ordinateur public dans une bibliothèque, tout ce que\n"
+"vous tapez pourrait être enregistré par un [[!wikipedia_fr Keylogger\n"
+"desc=\"enregistreur de frappe\"]] matériel.\n"
#. type: Plain text
#, no-wrap
@@ -38,11 +42,16 @@ msgid ""
"passwords and sensitive text. To display the virtual keyboard, click on\n"
"the keyboard icon in the notification area.\n"
msgstr ""
+"Vous pouvez utiliser le clavier virtuel [<span\n"
+"class=\"application\">Florence</span>](http://florence.sourceforge.net/francais.html)\n"
+"pour vous protéger des enregistreurs de frappe matériel lorsque vous tapez\n"
+"des mots de passe et du texte sensible. Pour afficher le clavier virtuel, cliquez\n"
+"sur l'icône de clavier dans la zone de notification.\n"
#. type: Plain text
#, no-wrap
msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/florence.png link=no]]\n"
-msgstr ""
+msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/florence.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -57,14 +66,21 @@ msgid ""
"could record your persistent volume passphrase or administration\n"
"password.\n"
msgstr ""
+"Il n'y a [[!tails_ticket 5563 desc=\"actuellement\"]] pas de clavier virtuel dans le\n"
+"<span class=\"application\">Tails Greeter</span>, ce qui fait qu'un enregistreur\n"
+"de frappe matériel pourrait enregistrer la phrase de passe de votre volume persistant\n"
+"ou votre mot de passe d'administration.\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
-#~ msgid "[[!meta title=\"Type passwords securely on an untrusted computer\"]]\n"
-#~ msgstr "[[!meta title=\"Taper des mots de passe de manière sûre sur un ordinateur qui ne l'est pas\"]]\n"
+#~ msgid ""
+#~ "[[!meta title=\"Type passwords securely on an untrusted computer\"]]\n"
+#~ msgstr ""
+#~ "[[!meta title=\"Taper des mots de passe de manière sûre sur un ordinateur "
+#~ "qui ne l'est pas\"]]\n"
#~ msgid ""
#~ "If an attacker had access to the computer you run Tails on, she might "
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index 2786ddb..f9d5a77 100644
--- a/wiki/src/doc/first_steps.index.de.po
+++ b/wiki/src/doc/first_steps.index.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-08 08:36+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,29 +19,30 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_stick_or_SD_card|first_steps/reset]],\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" using [[!traillink Windows|first_steps/reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
-" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
-" - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
-" - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[!traillink Startup_options|first_steps/startup_options]]\n"
+" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
" - [[!traillink Accessibility|first_steps/accessibility]]\n"
" - [[!traillink Persistence|first_steps/persistence]]\n"
-" - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
-" - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
-" - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
-" - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
+" - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+" - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+" - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+" - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
" - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
" - [[!traillink Upgrade_to_more_secure_persistent_volume_settings|first_steps/persistence/upgrade]]\n"
+" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index a45b1d6..db34353 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -6,11 +6,10 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-22 11:05+0100\n"
-"PO-Revision-Date: 2013-10-10 12:37-0000\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
+"PO-Revision-Date: 2014-02-27 08:00-0000\n"
"Last-Translator: \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"
@@ -18,30 +17,58 @@ msgstr ""
#. type: Plain text
#, no-wrap
+#| msgid ""
+#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
+#| " using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+#| " using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+#| " using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+#| " - [[!traillink Uninstalling_Tails_or_resetting_a_USB_stick_or_SD_card|first_steps/reset]],\n"
+#| " using [[!traillink Linux|first_steps/reset/linux]],\n"
+#| " using [[!traillink Windows|first_steps/reset/windows]]\n"
+#| " - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
+#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
+#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
+#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
+#| " - [[!traillink Persistence|first_steps/persistence]]\n"
+#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
+#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
+#| " - [[!traillink Upgrade_to_more_secure_persistent_volume_settings|first_steps/persistence/upgrade]]\n"
+#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
+#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
+#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_stick_or_SD_card|first_steps/reset]],\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" using [[!traillink Windows|first_steps/reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
-" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
-" - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
-" - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[!traillink Startup_options|first_steps/startup_options]]\n"
+" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
" - [[!traillink Accessibility|first_steps/accessibility]]\n"
" - [[!traillink Persistence|first_steps/persistence]]\n"
-" - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
-" - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
-" - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
-" - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
+" - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+" - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+" - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+" - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
" - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
" - [[!traillink Upgrade_to_more_secure_persistent_volume_settings|first_steps/persistence/upgrade]]\n"
+" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
@@ -58,17 +85,18 @@ msgstr ""
" - [[!traillink Démarrer_Tails|first_steps/start_tails]]\n"
" - [[!traillink Options_de_démarrage|first_steps/startup_options]]\n"
" - [[!traillink Mot_de_passe_administrateur|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Tor_en_mode_'Bridge'|first_steps/startup_options/bridge_mode]]\n"
-" - [[!traillink Thème_Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[!traillink Tor_en_mode_Bridge|first_steps/startup_options/bridge_mode]]\n"
+" - [[!traillink Camouflage_Windows|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink Introduction_à_GNOME_et_au_bureau_de_Tails|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
" - [[!traillink Accessibilité|first_steps/accessibility]]\n"
" - [[!traillink Persistance|first_steps/persistence]]\n"
-" - [[!traillink Avertissement_à_propos_de_la_persistance|first_steps/persistence/warnings]]\n"
+" - [[!traillink Avertissements_à_propos_de_la_persistance|first_steps/persistence/warnings]]\n"
" - [[!traillink Créer_et_configurer_un_volume_persistant|first_steps/persistence/configure]]\n"
" - [[!traillink Activer_et_utiliser_le_volume_persistant|first_steps/persistence/use]]\n"
-" - [[!traillink Effacer_le_volume_persistant|first_steps/persistence/delete]]\n"
+" - [[!traillink Changer_la_phrase_de_passe_du_volume_persistant|first_steps/persistence/change_passphrase]]\n"
" - [[!traillink Copier_manuellement_vos_données_persistantes_vers_un_nouveau_périphérique|first_steps/persistence/copy]]\n"
" - [[!traillink Mettre_à_jour_vers_des_paramètres_de_persistance_plus_sécurisés|first_steps/persistence/upgrade]]\n"
+" - [[!traillink Effacer_le_volume_persistant|first_steps/persistence/delete]]\n"
" - [[!traillink Rapporter_un_bug|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_ne_démarre_pas|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Éteindre_Tails|first_steps/shutdown]]\n"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index 8a220fb..046ab09 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,26 +1,27 @@
- - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],
+ - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)
+ - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],
using [[!traillink Linux|first_steps/installation/manual/linux]],
using [[!traillink Windows|first_steps/installation/manual/windows]]
using [[!traillink Mac|first_steps/installation/manual/mac]]
- - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],
+ - [[!traillink Uninstalling_Tails_or_resetting_a_USB_stick_or_SD_card|first_steps/reset]],
using [[!traillink Linux|first_steps/reset/linux]],
using [[!traillink Windows|first_steps/reset/windows]]
- - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]
+ - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- - [[!traillink Startup_Options|first_steps/startup_options]]
- - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]
- - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]
- - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]
- - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]
+ - [[!traillink Startup_options|first_steps/startup_options]]
+ - [[!traillink Administration_password|first_steps/startup_options/administration_password]]
+ - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]
+ - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]
+ - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]
- [[!traillink Accessibility|first_steps/accessibility]]
- [[!traillink Persistence|first_steps/persistence]]
- - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]
- - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]
- - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]
- - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]
+ - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]
+ - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]
+ - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]
+ - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]
- [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]
- [[!traillink Upgrade_to_more_secure_persistent_volume_settings|first_steps/persistence/upgrade]]
+ - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]
- [[!traillink Report_an_error|first_steps/bug_reporting]]
- [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]
- [[!traillink Shutting_down_Tails|first_steps/shutdown]]
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index a51d8fc..b8cdfe7 100644
--- a/wiki/src/doc/first_steps.index.pt.po
+++ b/wiki/src/doc/first_steps.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-08 08:36+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2012-10-09 20:03-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,42 +28,43 @@ msgstr ""
#| " for [[!traillink Windows|first_steps/reset/windows]]\n"
#| " - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/upgrade]]\n"
#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-#| " - [[!traillink Startup_Options|first_steps/startup_options]]\n"
-#| " - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
-#| " - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
-#| " - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
-#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
+#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
#| " - [[!traillink Persistence|first_steps/persistence]]\n"
-#| " - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
-#| " - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
-#| " - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
-#| " - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
+#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
#| " - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_stick_or_SD_card|first_steps/reset]],\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" using [[!traillink Windows|first_steps/reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
-" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
-" - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
-" - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[!traillink Startup_options|first_steps/startup_options]]\n"
+" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
" - [[!traillink Accessibility|first_steps/accessibility]]\n"
" - [[!traillink Persistence|first_steps/persistence]]\n"
-" - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
-" - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
-" - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
-" - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
+" - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+" - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+" - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+" - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
" - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
" - [[!traillink Upgrade_to_more_secure_persistent_volume_settings|first_steps/persistence/upgrade]]\n"
+" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
diff --git a/wiki/src/doc/first_steps/installation.de.po b/wiki/src/doc/first_steps/installation.de.po
index 4502dcd..a9227ee 100644
--- a/wiki/src/doc/first_steps/installation.de.po
+++ b/wiki/src/doc/first_steps/installation.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation.fr.po b/wiki/src/doc/first_steps/installation.fr.po
index 54fa9c3..a1d06bc 100644
--- a/wiki/src/doc/first_steps/installation.fr.po
+++ b/wiki/src/doc/first_steps/installation.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Installation sur une clé USB ou une carte SD\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation.mdwn b/wiki/src/doc/first_steps/installation.mdwn
index b3fa0de..a06e36e 100644
--- a/wiki/src/doc/first_steps/installation.mdwn
+++ b/wiki/src/doc/first_steps/installation.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Installing onto a USB Stick or SD card"]]
+[[!meta title="Installing onto a USB stick or SD card"]]
Tails includes <span class="application">Tails Installer</span> a custom
installer for USB sticks and SD cards.
diff --git a/wiki/src/doc/first_steps/installation.pt.po b/wiki/src/doc/first_steps/installation.pt.po
index c35517d..0441d6c 100644
--- a/wiki/src/doc/first_steps/installation.pt.po
+++ b/wiki/src/doc/first_steps/installation.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
-msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Instalando em uma memória USB\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation/manual.de.po b/wiki/src/doc/first_steps/installation/manual.de.po
index 4d7b108..47a3490 100644
--- a/wiki/src/doc/first_steps/installation/manual.de.po
+++ b/wiki/src/doc/first_steps/installation/manual.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation/manual.fr.po b/wiki/src/doc/first_steps/installation/manual.fr.po
index 08f4ee1..2286a88 100644
--- a/wiki/src/doc/first_steps/installation/manual.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual.fr.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Installation manuelle sur une clé USB ou une carte SD\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation/manual.mdwn b/wiki/src/doc/first_steps/installation/manual.mdwn
index e997d8e..49c0f7e 100644
--- a/wiki/src/doc/first_steps/installation/manual.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Manually installing onto a USB Stick or SD card"]]
+[[!meta title="Manually installing onto a USB stick or SD card"]]
[[!inline pages="doc/first_steps/installation/manual.intro" raw="yes"]]
diff --git a/wiki/src/doc/first_steps/installation/manual.pt.po b/wiki/src/doc/first_steps/installation/manual.pt.po
index 8892050..ecb0867 100644
--- a/wiki/src/doc/first_steps/installation/manual.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Manually Installing onto a USB Stick\"]]\n"
-msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Instalação manual em um dispositivo USB\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.de.po b/wiki/src/doc/first_steps/installation/manual/mac.de.po
index c0b4241..6a74070 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-05 18:29+0100\n"
+"POT-Creation-Date: 2014-02-22 09:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,48 +37,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Setup rEFInd</h2>\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"You need to have [rEFInd](http://sourceforge.net/projects/refind/) installed "
-"and working on the Mac."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"If you need help with rEFInd, look at [their installation documentation]"
-"(http://www.rodsbooks.com/refind/installing.html)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"rEFInd will replace your original bootloader.<br/>\n"
-"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
-"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
-"instructions</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"step_2\"></a>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-one\">Find out the device name of the USB stick</h2>\n"
msgstr ""
#. type: Plain text
@@ -170,6 +129,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name you should stop proceeding or\n"
"<strong>you risk overwriting any hard drive on the system</strong>.\n"
@@ -177,18 +141,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"step_3\"></a>\n"
+msgid "</div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Unmount the USB drive</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Unmount the USB drive</h2>\n"
msgstr ""
#. type: Plain text
msgid ""
"Execute the following command, replacing `[device]` with the device name "
-"found in step 2."
+"found in step 1."
msgstr ""
#. type: Plain text
@@ -198,7 +162,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Run isohybrid.pl on the ISO image</h2>\n"
+msgid "<h2 class=\"bullet-number-three\">Run isohybrid.pl on the ISO image</h2>\n"
msgstr ""
#. type: Plain text
@@ -277,7 +241,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-five\">Do the copy</h2>\n"
+msgid "<h2 class=\"bullet-number-four\">Do the copy</h2>\n"
msgstr ""
#. type: Plain text
@@ -316,7 +280,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<pre>sudo if=[tails.iso] of=[device]</pre>\n"
+msgid "<pre>sudo dd if=[tails.iso] of=[device]</pre>\n"
msgstr ""
#. type: Plain text
@@ -327,15 +291,33 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"next\">\n"
+msgid "<p>The installation is complete when the command prompt reappears.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<h2 class=\"bullet-number-five\">Setup rEFInd</h2>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To start Tails from that USB stick, you need to have [rEFInd](http://"
+"sourceforge.net/projects/refind/) installed on the Mac."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you need help with rEFInd, look at [their installation documentation]"
+"(http://www.rodsbooks.com/refind/installing.html)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>Once the command prompt reappears, you can restart your Mac.\n"
-"Wait for the rEFInd menu and select the USB stick to\n"
-"[[start Tails|/download/#start]].</p>\n"
+"rEFInd will replace your original bootloader.<br/>\n"
+"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
+"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
+"instructions</a>.\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.fr.po b/wiki/src/doc/first_steps/installation/manual/mac.fr.po
index ade61b6..0336ff4 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-07 17:16+0100\n"
+"POT-Creation-Date: 2014-02-22 09:44+0100\n"
"PO-Revision-Date: 2014-01-03 12:20-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,58 +36,9 @@ msgid "[[!toc levels=1]]\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Setup rEFInd</h2>\n"
-msgstr "<h2 class=\"bullet-number-one\">Configurer rEFInd</h2>\n"
-
-#. type: Plain text
-msgid ""
-"You need to have [rEFInd](http://sourceforge.net/projects/refind/) installed "
-"and working on the Mac."
-msgstr ""
-"Vous devez avoir [rEFInd](http://sourceforge.net/projects/refind/) installé "
-"et fonctionnel sur le Mac."
-
-#. type: Plain text
-msgid ""
-"If you need help with rEFInd, look at [their installation documentation]"
-"(http://www.rodsbooks.com/refind/installing.html)."
-msgstr ""
-"Si vous avez besoin d'aide concernant rEFInd, jetez un œil à [leur "
-"documentation d'installation (en anglais)](http://www.rodsbooks.com/refind/"
-"installing.html)."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"rEFInd will replace your original bootloader.<br/>\n"
-"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
-"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
-"instructions</a>.\n"
-msgstr ""
-"rEFInd remplacera votre programme d'amorçage par défaut.<br/>\n"
-"<strong>Cela peut empêcher votre Mac de démarrer.</strong> Il est recommandé de faire une sauvegarde complète ainsi\n"
-"que de savoir comment le restaurer. Voir <a href=\"https://support.apple.com/kb/HT1427?viewlocale=fr_FR\">\n"
-"les instructions d'Apple</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"step_2\"></a>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-one\">Find out the device name of the USB stick</h2>\n"
msgstr "<h2 class=\"bullet-number-two\">Trouver le nom de périphérique de la clé USB</h2>\n"
#. type: Plain text
@@ -219,6 +170,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name you should stop proceeding or\n"
"<strong>you risk overwriting any hard drive on the system</strong>.\n"
@@ -228,18 +184,23 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"step_3\"></a>\n"
+msgid "</div>\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Unmount the USB drive</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-three\">Unmount the USB drive</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Unmount the USB drive</h2>\n"
msgstr "<h2 class=\"bullet-number-three\">Démonter la clé USB</h2>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Execute the following command, replacing `[device]` with the device name "
+#| "found in step 2."
msgid ""
"Execute the following command, replacing `[device]` with the device name "
-"found in step 2."
+"found in step 1."
msgstr ""
"Exécutez la commande suivante, en remplaçant `[device]` par le nom du "
"périphérique trouvé à l'étape 2."
@@ -250,8 +211,9 @@ msgid " diskutil unmountDisk [device]\n"
msgstr " diskutil unmountDisk [device]\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Run isohybrid.pl on the ISO image</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-four\">Run isohybrid.pl on the ISO image</h2>\n"
+msgid "<h2 class=\"bullet-number-three\">Run isohybrid.pl on the ISO image</h2>\n"
msgstr "<h2 class=\"bullet-number-four\">Lancer isohybrid.pl sur l'image ISO</h2>\n"
#. type: Plain text
@@ -345,8 +307,9 @@ msgstr ""
"Complétez ensuite la commande et exécutez-la.\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-five\">Do the copy</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-five\">Do the copy</h2>\n"
+msgid "<h2 class=\"bullet-number-four\">Do the copy</h2>\n"
msgstr "<h2 class=\"bullet-number-five\">Faire la copie</h2>\n"
#. type: Plain text
@@ -393,7 +356,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " dd if=[tails.iso] of=[device] bs=16M\n"
-msgid "<pre>sudo if=[tails.iso] of=[device]</pre>\n"
+msgid "<pre>sudo dd if=[tails.iso] of=[device]</pre>\n"
msgstr " dd if=[tails.iso] of=[device] bs=16M\n"
#. type: Plain text
@@ -411,19 +374,48 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"next\">\n"
+msgid "<p>The installation is complete when the command prompt reappears.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-one\">Setup rEFInd</h2>\n"
+msgid "<h2 class=\"bullet-number-five\">Setup rEFInd</h2>\n"
+msgstr "<h2 class=\"bullet-number-one\">Configurer rEFInd</h2>\n"
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "You need to have [rEFInd](http://sourceforge.net/projects/refind/) "
+#| "installed and working on the Mac."
+msgid ""
+"To start Tails from that USB stick, you need to have [rEFInd](http://"
+"sourceforge.net/projects/refind/) installed on the Mac."
msgstr ""
+"Vous devez avoir [rEFInd](http://sourceforge.net/projects/refind/) installé "
+"et fonctionnel sur le Mac."
+
+#. type: Plain text
+msgid ""
+"If you need help with rEFInd, look at [their installation documentation]"
+"(http://www.rodsbooks.com/refind/installing.html)."
+msgstr ""
+"Si vous avez besoin d'aide concernant rEFInd, jetez un œil à [leur "
+"documentation d'installation (en anglais)](http://www.rodsbooks.com/refind/"
+"installing.html)."
#. type: Plain text
#, no-wrap
msgid ""
-"<p>Once the command prompt reappears, you can restart your Mac.\n"
-"Wait for the rEFInd menu and select the USB stick to\n"
-"[[start Tails|/download/#start]].</p>\n"
+"rEFInd will replace your original bootloader.<br/>\n"
+"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
+"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
+"instructions</a>.\n"
msgstr ""
-"<p>Lorsque l'invite de commande réapparaît, vous pouvez redémarrer.\n"
-"votre Mac. Attendre le menu rEFInd et sélectionnez la clé USB pou\n"
-"[[démarrer Tails|/download/#start]].</p>\n"
+"rEFInd remplacera votre programme d'amorçage par défaut.<br/>\n"
+"<strong>Cela peut empêcher votre Mac de démarrer.</strong> Il est recommandé de faire une sauvegarde complète ainsi\n"
+"que de savoir comment le restaurer. Voir <a href=\"https://support.apple.com/kb/HT1427?viewlocale=fr_FR\">\n"
+"les instructions d'Apple</a>.\n"
#. type: Title =
#, no-wrap
@@ -501,3 +493,12 @@ msgid ""
msgstr ""
"1. La destination est la clé USB\n"
"-->\n"
+
+#~ msgid ""
+#~ "<p>Once the command prompt reappears, you can restart your Mac.\n"
+#~ "Wait for the rEFInd menu and select the USB stick to\n"
+#~ "[[start Tails|/download/#start]].</p>\n"
+#~ msgstr ""
+#~ "<p>Lorsque l'invite de commande réapparaît, vous pouvez redémarrer.\n"
+#~ "votre Mac. Attendre le menu rEFInd et sélectionnez la clé USB pou\n"
+#~ "[[démarrer Tails|/download/#start]].</p>\n"
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.mdwn b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
index cb49386..d3f4830 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
@@ -6,26 +6,7 @@ This technique uses the command line.
[[!toc levels=1]]
-<h2 class="bullet-number-one">Setup rEFInd</h2>
-
-You need to have [rEFInd](http://sourceforge.net/projects/refind/) installed and
-working on the Mac.
-
-If you need help with rEFInd, look at [their installation
-documentation](http://www.rodsbooks.com/refind/installing.html).
-
-<div class="caution">
-
-rEFInd will replace your original bootloader.<br/>
-<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to
-restore. See <a href="https://support.apple.com/kb/HT1427">Apple's
-instructions</a>.
-
-</div>
-
-<a id="step_2"></a>
-
-<h2 class="bullet-number-two">Find out the device name of the USB stick</h2>
+<h2 class="bullet-number-one">Find out the device name of the USB stick</h2>
The device name should be something like `/dev/disk8`, `/dev/disk9`, etc.
@@ -88,16 +69,14 @@ If you are not sure about the device name you should stop proceeding or
</div>
-<a id="step_3"></a>
-
-<h2 class="bullet-number-three">Unmount the USB drive</h2>
+<h2 class="bullet-number-two">Unmount the USB drive</h2>
Execute the following command, replacing `[device]`
-with the device name found in step 2.
+with the device name found in step 1.
diskutil unmountDisk [device]
-<h2 class="bullet-number-four">Run isohybrid.pl on the ISO image</h2>
+<h2 class="bullet-number-three">Run isohybrid.pl on the ISO image</h2>
You need to modify the ISO image using `isohybrid` before copying it onto
the USB stick.
@@ -133,7 +112,7 @@ Then complete the command and execute it.
</div>
-<h2 class="bullet-number-five">Do the copy</h2>
+<h2 class="bullet-number-four">Do the copy</h2>
Execute the following command, replacing `[tails.iso]` by the path to the ISO
image that you want to copy and `[device]` by the device name found in step
@@ -153,18 +132,29 @@ stick. The whole process might take some time, generally a few minutes.
If you get a "Permission denied" error, try executing the command with
<code>sudo</code>:
-<pre>sudo if=[tails.iso] of=[device]</pre>
+<pre>sudo dd if=[tails.iso] of=[device]</pre>
Be careful, if the device name is wrong you might overwriting any hard drive on
the system.
</div>
-<div class="next">
+<p>The installation is complete when the command prompt reappears.</p>
+
+<h2 class="bullet-number-five">Setup rEFInd</h2>
+
+To start Tails from that USB stick, you need to have
+[rEFInd](http://sourceforge.net/projects/refind/) installed on the Mac.
+
+If you need help with rEFInd, look at [their installation
+documentation](http://www.rodsbooks.com/refind/installing.html).
-<p>Once the command prompt reappears, you can restart your Mac.
-Wait for the rEFInd menu and select the USB stick to
-[[start Tails|/download/#start]].</p>
+<div class="caution">
+
+rEFInd will replace your original bootloader.<br/>
+<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to
+restore. See <a href="https://support.apple.com/kb/HT1427">Apple's
+instructions</a>.
</div>
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.pt.po b/wiki/src/doc/first_steps/installation/manual/mac.pt.po
index c0b4241..6a74070 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-05 18:29+0100\n"
+"POT-Creation-Date: 2014-02-22 09:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,48 +37,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-one\">Setup rEFInd</h2>\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"You need to have [rEFInd](http://sourceforge.net/projects/refind/) installed "
-"and working on the Mac."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"If you need help with rEFInd, look at [their installation documentation]"
-"(http://www.rodsbooks.com/refind/installing.html)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"rEFInd will replace your original bootloader.<br/>\n"
-"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
-"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
-"instructions</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"step_2\"></a>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-one\">Find out the device name of the USB stick</h2>\n"
msgstr ""
#. type: Plain text
@@ -170,6 +129,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name you should stop proceeding or\n"
"<strong>you risk overwriting any hard drive on the system</strong>.\n"
@@ -177,18 +141,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"step_3\"></a>\n"
+msgid "</div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-three\">Unmount the USB drive</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Unmount the USB drive</h2>\n"
msgstr ""
#. type: Plain text
msgid ""
"Execute the following command, replacing `[device]` with the device name "
-"found in step 2."
+"found in step 1."
msgstr ""
#. type: Plain text
@@ -198,7 +162,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-four\">Run isohybrid.pl on the ISO image</h2>\n"
+msgid "<h2 class=\"bullet-number-three\">Run isohybrid.pl on the ISO image</h2>\n"
msgstr ""
#. type: Plain text
@@ -277,7 +241,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-five\">Do the copy</h2>\n"
+msgid "<h2 class=\"bullet-number-four\">Do the copy</h2>\n"
msgstr ""
#. type: Plain text
@@ -316,7 +280,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<pre>sudo if=[tails.iso] of=[device]</pre>\n"
+msgid "<pre>sudo dd if=[tails.iso] of=[device]</pre>\n"
msgstr ""
#. type: Plain text
@@ -327,15 +291,33 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"next\">\n"
+msgid "<p>The installation is complete when the command prompt reappears.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<h2 class=\"bullet-number-five\">Setup rEFInd</h2>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To start Tails from that USB stick, you need to have [rEFInd](http://"
+"sourceforge.net/projects/refind/) installed on the Mac."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you need help with rEFInd, look at [their installation documentation]"
+"(http://www.rodsbooks.com/refind/installing.html)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>Once the command prompt reappears, you can restart your Mac.\n"
-"Wait for the rEFInd menu and select the USB stick to\n"
-"[[start Tails|/download/#start]].</p>\n"
+"rEFInd will replace your original bootloader.<br/>\n"
+"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
+"restore. See <a href=\"https://support.apple.com/kb/HT1427\">Apple's\n"
+"instructions</a>.\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/persistence.de.po b/wiki/src/doc/first_steps/persistence.de.po
index 04ede81..9fe18b5 100644
--- a/wiki/src/doc/first_steps/persistence.de.po
+++ b/wiki/src/doc/first_steps/persistence.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-02 11:30+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,24 +92,36 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"How to Use the Persistent Volume\n"
+"How to use the persistent volume\n"
"=================================\n"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Warnings About Persistence|first_steps/persistence/warnings]]"
+msgid "[[Warnings about persistence|first_steps/persistence/warnings]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Create & Configure the Persistent Volume|first_steps/persistence/"
+"[[Create & configure the persistent volume|first_steps/persistence/"
"configure]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Enable & Use the Persistent Volume|first_steps/persistence/use]]"
+msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Delete the Persistent Volume|first_steps/persistence/delete]]"
+msgid ""
+"[[Change the passphrase of the persistent volume|first_steps/persistence/"
+"change_passphrase]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Manually copy your persistent data to a new device|first_steps/persistence/"
+"copy]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Delete the persistent volume|first_steps/persistence/delete]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence.fr.po b/wiki/src/doc/first_steps/persistence.fr.po
index 75b97cd..33ac3a5 100644
--- a/wiki/src/doc/first_steps/persistence.fr.po
+++ b/wiki/src/doc/first_steps/persistence.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-02 11:30+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2013-10-23 11:52-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
@@ -103,35 +103,59 @@ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
msgid ""
-"How to Use the Persistent Volume\n"
+"How to use the persistent volume\n"
"=================================\n"
msgstr ""
"Comment utiliser le volume persistant\n"
"=================================\n"
#. type: Bullet: ' - '
-msgid "[[Warnings About Persistence|first_steps/persistence/warnings]]"
+msgid "[[Warnings about persistence|first_steps/persistence/warnings]]"
msgstr ""
"[[Avertissement à propos de la persistance|first_steps/persistence/warnings]]"
#. type: Bullet: ' - '
msgid ""
-"[[Create & Configure the Persistent Volume|first_steps/persistence/"
+"[[Create & configure the persistent volume|first_steps/persistence/"
"configure]]"
msgstr ""
"[[Créer et configurer le volume persistant|first_steps/persistence/"
"configure]]"
#. type: Bullet: ' - '
-msgid "[[Enable & Use the Persistent Volume|first_steps/persistence/use]]"
+msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
msgstr ""
"[[Activer et utiliser le volume persistant|first_steps/persistence/use]]"
#. type: Bullet: ' - '
-msgid "[[Delete the Persistent Volume|first_steps/persistence/delete]]"
+#, fuzzy
+#| msgid ""
+#| "[[Create & configure the persistent volume|first_steps/persistence/"
+#| "configure]]"
+msgid ""
+"[[Change the passphrase of the persistent volume|first_steps/persistence/"
+"change_passphrase]]"
+msgstr ""
+"[[Créer et configurer le volume persistant|first_steps/persistence/"
+"configure]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
+msgid ""
+"[[Manually copy your persistent data to a new device|first_steps/persistence/"
+"copy]]"
+msgstr ""
+"[[Activer et utiliser le volume persistant|first_steps/persistence/use]]"
+
+#. type: Bullet: ' - '
+msgid "[[Delete the persistent volume|first_steps/persistence/delete]]"
msgstr "[[Supprimer le volume persistant|first_steps/persistence/delete]]"
#, fuzzy
-#~| msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
-#~ msgid "[[!inline pages=\"doc/first_steps/persistence.installer\" raw=\"yes\"]]\n"
-#~ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]\n"
+#~| msgid ""
+#~| "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+#~ msgid ""
+#~ "[[!inline pages=\"doc/first_steps/persistence.installer\" raw=\"yes\"]]\n"
+#~ msgstr ""
+#~ "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/first_steps/persistence.mdwn b/wiki/src/doc/first_steps/persistence.mdwn
index 2c57769..d18abf7 100644
--- a/wiki/src/doc/first_steps/persistence.mdwn
+++ b/wiki/src/doc/first_steps/persistence.mdwn
@@ -29,10 +29,12 @@ each time you start Tails.
[[!inline pages="doc/first_steps/persistence.caution" raw="yes"]]
-How to Use the Persistent Volume
+How to use the persistent volume
=================================
- - [[Warnings About Persistence|first_steps/persistence/warnings]]
- - [[Create & Configure the Persistent Volume|first_steps/persistence/configure]]
- - [[Enable & Use the Persistent Volume|first_steps/persistence/use]]
- - [[Delete the Persistent Volume|first_steps/persistence/delete]]
+ - [[Warnings about persistence|first_steps/persistence/warnings]]
+ - [[Create & configure the persistent volume|first_steps/persistence/configure]]
+ - [[Enable & use the persistent volume|first_steps/persistence/use]]
+ - [[Change the passphrase of the persistent volume|first_steps/persistence/change_passphrase]]
+ - [[Manually copy your persistent data to a new device|first_steps/persistence/copy]]
+ - [[Delete the persistent volume|first_steps/persistence/delete]]
diff --git a/wiki/src/doc/first_steps/persistence.pt.po b/wiki/src/doc/first_steps/persistence.pt.po
index 0b56e20..f9aa04f 100644
--- a/wiki/src/doc/first_steps/persistence.pt.po
+++ b/wiki/src/doc/first_steps/persistence.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-02 11:30+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2012-11-06 16:12-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,32 +105,54 @@ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"How to Use the Persistent Volume\n"
+"How to use the persistent volume\n"
"=================================\n"
msgstr ""
"Como usar o Persistent Volume\n"
"=================================\n"
#. type: Bullet: ' - '
-msgid "[[Warnings About Persistence|first_steps/persistence/warnings]]"
+msgid "[[Warnings about persistence|first_steps/persistence/warnings]]"
msgstr "[[Aviso Sobre Persistencia|first_steps/persistence/warnings]]"
#. type: Bullet: ' - '
msgid ""
-"[[Create & Configure the Persistent Volume|first_steps/persistence/"
+"[[Create & configure the persistent volume|first_steps/persistence/"
"configure]]"
msgstr ""
"[[Criar & Configurar o Persistent Volume|first_steps/persistence/configure]]"
#. type: Bullet: ' - '
-msgid "[[Enable & Use the Persistent Volume|first_steps/persistence/use]]"
+msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
msgstr "[[Habilitar & Usar o Persistent Volume|first_steps/persistence/use]]"
#. type: Bullet: ' - '
-msgid "[[Delete the Persistent Volume|first_steps/persistence/delete]]"
+#, fuzzy
+#| msgid ""
+#| "[[Create & configure the persistent volume|first_steps/persistence/"
+#| "configure]]"
+msgid ""
+"[[Change the passphrase of the persistent volume|first_steps/persistence/"
+"change_passphrase]]"
+msgstr ""
+"[[Criar & Configurar o Persistent Volume|first_steps/persistence/configure]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
+msgid ""
+"[[Manually copy your persistent data to a new device|first_steps/persistence/"
+"copy]]"
+msgstr "[[Habilitar & Usar o Persistent Volume|first_steps/persistence/use]]"
+
+#. type: Bullet: ' - '
+msgid "[[Delete the persistent volume|first_steps/persistence/delete]]"
msgstr "[[Apagar o Persistent Volume|first_steps/persistence/delete]]"
#, fuzzy
-#~| msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
-#~ msgid "[[!inline pages=\"doc/first_steps/persistence.installer\" raw=\"yes\"]]\n"
-#~ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+#~| msgid ""
+#~| "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+#~ msgid ""
+#~ "[[!inline pages=\"doc/first_steps/persistence.installer\" raw=\"yes\"]]\n"
+#~ msgstr ""
+#~ "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.de.po b/wiki/src/doc/first_steps/persistence/change_passphrase.de.po
new file mode 100644
index 0000000..5a7cfaf
--- /dev/null
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.de.po
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Start GNOME Disk utility\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the "
+"menu\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" </span>.\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Find out the device of the persistent volume\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage\n"
+"devices in the left pane of the window. When you select one of these "
+"devices,\n"
+"detailed information about it is displayed in the right pane: its "
+"partitions,\n"
+"its brand, its size, etc.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Find which device contains the persistent volume. It should have two "
+"partitions, one labelled <span class=\"guilabel\">Tails</span>, and another "
+"one laballed <span class=\"guilabel\">TailsData</span> which corresponds to "
+"the persistent volume."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Change persistent volume passphrase\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, select the persistent volume partition, labelled <span "
+"class=\"TailsData\"> by clicking on it."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid "Type your current passphrase and then type twice a new one."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 5. '
+msgid ""
+"You now can restart Tails and try to enable the persistent volume with its "
+"new passphrase."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po b/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po
new file mode 100644
index 0000000..5a7cfaf
--- /dev/null
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.fr.po
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Start GNOME Disk utility\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the "
+"menu\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" </span>.\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Find out the device of the persistent volume\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage\n"
+"devices in the left pane of the window. When you select one of these "
+"devices,\n"
+"detailed information about it is displayed in the right pane: its "
+"partitions,\n"
+"its brand, its size, etc.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Find which device contains the persistent volume. It should have two "
+"partitions, one labelled <span class=\"guilabel\">Tails</span>, and another "
+"one laballed <span class=\"guilabel\">TailsData</span> which corresponds to "
+"the persistent volume."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Change persistent volume passphrase\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, select the persistent volume partition, labelled <span "
+"class=\"TailsData\"> by clicking on it."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid "Type your current passphrase and then type twice a new one."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 5. '
+msgid ""
+"You now can restart Tails and try to enable the persistent volume with its "
+"new passphrase."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn b/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn
new file mode 100644
index 0000000..9bc7b19
--- /dev/null
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.mdwn
@@ -0,0 +1,42 @@
+[[!meta title="Change the passphrase of the persistent volume"]]
+
+[[!toc levels=2]]
+
+Start GNOME Disk utility
+========================
+
+ 1. Open <span class="application">GNOME Disk Utility</span> from the menu
+ <span class="menuchoice">
+ <span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">System Tools</span>&nbsp;▸
+ <span class="guimenuitem">Disk Utility</span>
+ </span>.
+
+Find out the device of the persistent volume
+============================================
+
+<span class="application">Disk Utility</span> lists all the current storage
+devices in the left pane of the window. When you select one of these devices,
+detailed information about it is displayed in the right pane: its partitions,
+its brand, its size, etc.
+
+ 1. Find which device contains the persistent volume. It should have
+ two partitions, one labelled <span class="guilabel">Tails</span>, and another
+ one laballed <span class="guilabel">TailsData</span> which corresponds to the persistent volume.
+
+ 1. In the right pane of the window, verify that the device corresponds
+ to your device, its brand, its size, etc.
+
+Change persistent volume passphrase
+===================================
+
+ 1. In the right pane, select the persistent volume partition, labelled <span class="TailsData"> by clicking on it.
+
+ 2. Click on <span class="guilabel">Change Passphrase</span>.
+
+ 3. Type your current passphrase and then type twice a new one.
+
+ 4. Finally click on <span class="guilabel">Change passphrase</span>.
+
+ 5. You now can restart Tails and try to enable the persistent volume
+ with its new passphrase.
diff --git a/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po b/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
new file mode 100644
index 0000000..5a7cfaf
--- /dev/null
+++ b/wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Change the passphrase of the persistent volume\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Start GNOME Disk utility\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the "
+"menu\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disk Utility</span>\n"
+" </span>.\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Find out the device of the persistent volume\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage\n"
+"devices in the left pane of the window. When you select one of these "
+"devices,\n"
+"detailed information about it is displayed in the right pane: its "
+"partitions,\n"
+"its brand, its size, etc.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Find which device contains the persistent volume. It should have two "
+"partitions, one labelled <span class=\"guilabel\">Tails</span>, and another "
+"one laballed <span class=\"guilabel\">TailsData</span> which corresponds to "
+"the persistent volume."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Change persistent volume passphrase\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, select the persistent volume partition, labelled <span "
+"class=\"TailsData\"> by clicking on it."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on <span class=\"guilabel\">Change Passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid "Type your current passphrase and then type twice a new one."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid "Finally click on <span class=\"guilabel\">Change passphrase</span>."
+msgstr ""
+
+#. type: Bullet: ' 5. '
+msgid ""
+"You now can restart Tails and try to enable the persistent volume with its "
+"new passphrase."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/configure.de.po b/wiki/src/doc/first_steps/persistence/configure.de.po
index 22e7e64..798f257 100644
--- a/wiki/src/doc/first_steps/persistence/configure.de.po
+++ b/wiki/src/doc/first_steps/persistence/configure.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Create & Configure the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Create & configure the persistent volume\"]]\n"
msgstr ""
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Start the Persistent Volume Assistant\n"
+msgid "Start the persistent volume assistant\n"
msgstr ""
#. type: Plain text
@@ -67,7 +67,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Creating the Persistent Volume\n"
+msgid "Creating the persistent volume\n"
msgstr ""
#. type: Plain text
@@ -111,7 +111,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Persistent Volume Features\n"
+msgid "Persistent volume features\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index 9ccc7e7..2597e6a 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Create & Configure the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Create & configure the persistent volume\"]]\n"
msgstr "[[!meta title=\"Créer et configurer un volume persistant\"]]\n"
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr "[[!toc levels=2]]\n"
#. type: Title =
#, no-wrap
-msgid "Start the Persistent Volume Assistant\n"
+msgid "Start the persistent volume assistant\n"
msgstr "Démarrer l'assistant de persistance\n"
#. type: Plain text
@@ -76,7 +76,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Creating the Persistent Volume\n"
+msgid "Creating the persistent volume\n"
msgstr "Créer le volume persistant\n"
#. type: Plain text
@@ -134,7 +134,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Persistent Volume Features\n"
+msgid "Persistent volume features\n"
msgstr "Options du volume persistant\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/configure.mdwn b/wiki/src/doc/first_steps/persistence/configure.mdwn
index 73a35f2..f4f5445 100644
--- a/wiki/src/doc/first_steps/persistence/configure.mdwn
+++ b/wiki/src/doc/first_steps/persistence/configure.mdwn
@@ -1,10 +1,10 @@
-[[!meta title="Create & Configure the Persistent Volume"]]
+[[!meta title="Create & configure the persistent volume"]]
[[!inline pages="doc/first_steps/persistence.caution" raw="yes"]]
[[!toc levels=2]]
-Start the Persistent Volume Assistant
+Start the persistent volume assistant
=====================================
To start the persistent volume assistant, choose
@@ -22,7 +22,7 @@ but you can delete it and create a new one.
</div>
-Creating the Persistent Volume
+Creating the persistent volume
==============================
When run for the first time, or after [[deleting the persistent
@@ -48,7 +48,7 @@ the persistent volume. [[Delete|first_steps/reset]] and
</div>
-Persistent Volume Features
+Persistent volume features
==========================
When run from a Tails device that already has a persistent volume, the assistant
diff --git a/wiki/src/doc/first_steps/persistence/configure.pt.po b/wiki/src/doc/first_steps/persistence/configure.pt.po
index b54eb5c..3987207 100644
--- a/wiki/src/doc/first_steps/persistence/configure.pt.po
+++ b/wiki/src/doc/first_steps/persistence/configure.pt.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Create & Configure the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Create & configure the persistent volume\"]]\n"
msgstr "[[!meta title=\"Crie & Configure o Volume Persistente\"]]\n"
#. type: Plain text
@@ -32,7 +32,7 @@ msgstr "[[!toc levels=2]]\n"
#. type: Title =
#, no-wrap
-msgid "Start the Persistent Volume Assistant\n"
+msgid "Start the persistent volume assistant\n"
msgstr "Inicie o Assistente de Volume Persistente\n"
#. type: Plain text
@@ -71,7 +71,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Creating the Persistent Volume\n"
+msgid "Creating the persistent volume\n"
msgstr ""
#. type: Plain text
@@ -115,7 +115,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Persistent Volume Features\n"
+msgid "Persistent volume features\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/delete.de.po b/wiki/src/doc/first_steps/persistence/delete.de.po
index 63f1178..563f117 100644
--- a/wiki/src/doc/first_steps/persistence/delete.de.po
+++ b/wiki/src/doc/first_steps/persistence/delete.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 02:30+0300\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Delete the Persistent Volume\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+msgid "[[!meta title=\"Delete the persistent volume\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/delete.fr.po b/wiki/src/doc/first_steps/persistence/delete.fr.po
index 42b347d..83e8dcf 100644
--- a/wiki/src/doc/first_steps/persistence/delete.fr.po
+++ b/wiki/src/doc/first_steps/persistence/delete.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-28 02:41+0000\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2013-02-26 14:51-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
@@ -18,16 +18,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Delete the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Delete the persistent volume\"]]\n"
msgstr "[[!meta title=\"Supprimer le volume persistant\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
"To delete the persistent volume of a Tails device, choose\n"
"<span class=\"menuchoice\">\n"
@@ -104,3 +99,6 @@ msgstr ""
#, no-wrap
msgid "</div>\n"
msgstr ""
+
+#~ msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+#~ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/first_steps/persistence/delete.mdwn b/wiki/src/doc/first_steps/persistence/delete.mdwn
index b0b44d8..01de781 100644
--- a/wiki/src/doc/first_steps/persistence/delete.mdwn
+++ b/wiki/src/doc/first_steps/persistence/delete.mdwn
@@ -1,6 +1,4 @@
-[[!meta title="Delete the Persistent Volume"]]
-
-[[!inline pages="doc/first_steps/persistence.caution" raw="yes"]]
+[[!meta title="Delete the persistent volume"]]
To delete the persistent volume of a Tails device, choose
<span class="menuchoice">
diff --git a/wiki/src/doc/first_steps/persistence/delete.pt.po b/wiki/src/doc/first_steps/persistence/delete.pt.po
index 63f1178..563f117 100644
--- a/wiki/src/doc/first_steps/persistence/delete.pt.po
+++ b/wiki/src/doc/first_steps/persistence/delete.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 02:30+0300\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Delete the Persistent Volume\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
+msgid "[[!meta title=\"Delete the persistent volume\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/use.de.po b/wiki/src/doc/first_steps/persistence/use.de.po
index 728956d..6e28e4d 100644
--- a/wiki/src/doc/first_steps/persistence/use.de.po
+++ b/wiki/src/doc/first_steps/persistence/use.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Enable & Use the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Enable & use the persistent volume\"]]\n"
msgstr ""
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Enable the Persistent Volume\n"
+msgid "Enable the persistent volume\n"
msgstr ""
#. type: Plain text
@@ -62,7 +62,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Use the Persistent Volume\n"
+msgid "Use the persistent volume\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/use.fr.po b/wiki/src/doc/first_steps/persistence/use.fr.po
index 82e2080..84e6a2a 100644
--- a/wiki/src/doc/first_steps/persistence/use.fr.po
+++ b/wiki/src/doc/first_steps/persistence/use.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Enable & Use the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Enable & use the persistent volume\"]]\n"
msgstr "[[!meta title=\"Activer et Utiliser le Volume Persistant\"]]\n"
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Enable the Persistent Volume\n"
+msgid "Enable the persistent volume\n"
msgstr "Activer le Volume Persistant\n"
#. type: Plain text
@@ -71,7 +71,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Use the Persistent Volume\n"
+msgid "Use the persistent volume\n"
msgstr "Utiliser le Volume Persistant\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/use.mdwn b/wiki/src/doc/first_steps/persistence/use.mdwn
index 459e834..cbd9192 100644
--- a/wiki/src/doc/first_steps/persistence/use.mdwn
+++ b/wiki/src/doc/first_steps/persistence/use.mdwn
@@ -1,10 +1,10 @@
-[[!meta title="Enable & Use the Persistent Volume"]]
+[[!meta title="Enable & use the persistent volume"]]
[[!inline pages="doc/first_steps/persistence.caution" raw="yes"]]
[[!toc levels=1]]
-Enable the Persistent Volume
+Enable the persistent volume
============================
1. When starting Tails, in the
@@ -19,7 +19,7 @@ enable the persistent volume for the current working session.
content of persistent volume will be available and you will be able to modify
it but the changes will not be saved.
-Use the Persistent Volume
+Use the persistent volume
=========================
To open the <span class="filename">Persistent</span> folder and access you
diff --git a/wiki/src/doc/first_steps/persistence/use.pt.po b/wiki/src/doc/first_steps/persistence/use.pt.po
index 728956d..6e28e4d 100644
--- a/wiki/src/doc/first_steps/persistence/use.pt.po
+++ b/wiki/src/doc/first_steps/persistence/use.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Enable & Use the Persistent Volume\"]]\n"
+msgid "[[!meta title=\"Enable & use the persistent volume\"]]\n"
msgstr ""
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Enable the Persistent Volume\n"
+msgid "Enable the persistent volume\n"
msgstr ""
#. type: Plain text
@@ -62,7 +62,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Use the Persistent Volume\n"
+msgid "Use the persistent volume\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/warnings.de.po b/wiki/src/doc/first_steps/persistence/warnings.de.po
index 54b3142..aecf800 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.de.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Warnings About Persistence\"]]\n"
+msgid "[[!meta title=\"Warnings about persistence\"]]\n"
msgstr ""
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Storing Sensitive Documents\n"
+msgid "Storing sensitive documents\n"
msgstr ""
#. type: Plain text
@@ -59,7 +59,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Overwriting Configurations\n"
+msgid "Overwriting configurations\n"
msgstr ""
#. type: Plain text
@@ -91,7 +91,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Installing Additional Programs\n"
+msgid "Installing additional programs\n"
msgstr ""
#. type: Plain text
@@ -110,7 +110,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Browser Plugins\n"
+msgid "Browser plugins\n"
msgstr ""
#. type: Plain text
@@ -128,7 +128,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Use to the Minimum\n"
+msgid "Use to the minimum\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/warnings.fr.po b/wiki/src/doc/first_steps/persistence/warnings.fr.po
index 12ad0b2..4b85545 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.fr.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Warnings About Persistence\"]]\n"
+msgid "[[!meta title=\"Warnings about persistence\"]]\n"
msgstr "[[!meta title=\"Avertissement à propos de la persistance\"]]\n"
#. type: Plain text
@@ -33,7 +33,7 @@ msgstr "<a id=\"sensitive_documents\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Storing Sensitive Documents\n"
+msgid "Storing sensitive documents\n"
msgstr "Stocker des documents sensibles\n"
#. type: Plain text
@@ -65,7 +65,7 @@ msgstr "<a id=\"overwriting_configurations\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Overwriting Configurations\n"
+msgid "Overwriting configurations\n"
msgstr "Écrasement des configurations par défaut\n"
#. type: Plain text
@@ -107,7 +107,7 @@ msgstr "<a id=\"installing_programs\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Installing Additional Programs\n"
+msgid "Installing additional programs\n"
msgstr "Installation de logiciels additionnels\n"
#. type: Plain text
@@ -132,7 +132,7 @@ msgstr "<a id=\"browser_plugins\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Browser Plugins\n"
+msgid "Browser plugins\n"
msgstr "Les modules complémentaires du navigateur\n"
#. type: Plain text
@@ -155,7 +155,7 @@ msgstr "<a id=\"minimum\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Use to the Minimum\n"
+msgid "Use to the minimum\n"
msgstr "Utilisez-le au minimum\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/warnings.mdwn b/wiki/src/doc/first_steps/persistence/warnings.mdwn
index 8c666b5..bca2eca 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.mdwn
+++ b/wiki/src/doc/first_steps/persistence/warnings.mdwn
@@ -1,10 +1,10 @@
-[[!meta title="Warnings About Persistence"]]
+[[!meta title="Warnings about persistence"]]
[[!toc levels=1]]
<a id="sensitive_documents"></a>
-Storing Sensitive Documents
+Storing sensitive documents
===========================
**The persistent volume is not hidden.** An attacker in possession of
@@ -17,7 +17,7 @@ Read also how to [[delete the persistent volume|delete]].
<a id="overwriting_configurations"></a>
-Overwriting Configurations
+Overwriting configurations
==========================
The programs included in Tails are carefully configured with security in
@@ -34,7 +34,7 @@ configurations can break your anonymity.</strong>
<a id="installing_programs"></a>
-Installing Additional Programs
+Installing additional programs
==============================
To protect your anonymity and leave no trace, Tails developers select and
@@ -45,7 +45,7 @@ you to solve those problems.
<a id="browser_plugins"></a>
-Browser Plugins
+Browser plugins
===============
The web browser is a central part in a system like Tails. The plugins included
@@ -55,7 +55,7 @@ anonymity.**
<a id="minimum"></a>
-Use to the Minimum
+Use to the minimum
==================
**Use the persistent volume only when necessary and to the minimum.** It is
diff --git a/wiki/src/doc/first_steps/persistence/warnings.pt.po b/wiki/src/doc/first_steps/persistence/warnings.pt.po
index 8a65b0bc..7d84dc4 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.pt.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.pt.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Warnings About Persistence\"]]\n"
+msgid "[[!meta title=\"Warnings about persistence\"]]\n"
msgstr "[[!meta title=\"Advertências Sobre Persistência\"]]\n"
#. type: Plain text
@@ -32,7 +32,7 @@ msgstr "<a id=\"sensitive_documents\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Storing Sensitive Documents\n"
+msgid "Storing sensitive documents\n"
msgstr "Armazenando documentos sensíveis\n"
#. type: Plain text
@@ -68,7 +68,7 @@ msgstr "<a id=\"overwriting_configurations\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Overwriting Configurations\n"
+msgid "Overwriting configurations\n"
msgstr "Sobrescrevendo Configurações\n"
#. type: Plain text
@@ -113,7 +113,7 @@ msgstr "<a id=\"installing_programs\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Installing Additional Programs\n"
+msgid "Installing additional programs\n"
msgstr "Instalando Programas Adicionais\n"
#. type: Plain text
@@ -138,7 +138,7 @@ msgstr "<a id=\"browser_plugins\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Browser Plugins\n"
+msgid "Browser plugins\n"
msgstr "Plugins de Navegadores\n"
#. type: Plain text
@@ -160,7 +160,7 @@ msgstr "<a id=\"minimum\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Use to the Minimum\n"
+msgid "Use to the minimum\n"
msgstr "Use o Mínimo Possível\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/reset.de.po b/wiki/src/doc/first_steps/reset.de.po
index 8203d6a..7bb92fc 100644
--- a/wiki/src/doc/first_steps/reset.de.po
+++ b/wiki/src/doc/first_steps/reset.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/reset.fr.po b/wiki/src/doc/first_steps/reset.fr.po
index baddb7e..0db4c5d 100644
--- a/wiki/src/doc/first_steps/reset.fr.po
+++ b/wiki/src/doc/first_steps/reset.fr.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Désinstaller Tails ou réinitialiser une clé USB ou carte SD\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/reset.mdwn b/wiki/src/doc/first_steps/reset.mdwn
index 80e1fbd..af0575b 100644
--- a/wiki/src/doc/first_steps/reset.mdwn
+++ b/wiki/src/doc/first_steps/reset.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Uninstalling Tails or resetting a USB Stick or SD card"]]
+[[!meta title="Uninstalling Tails or resetting a USB stick or SD card"]]
[[!inline pages="doc/first_steps/usb_reset.intro" raw="yes"]]
diff --git a/wiki/src/doc/first_steps/reset.pt.po b/wiki/src/doc/first_steps/reset.pt.po
index 0deda68..f6915d0 100644
--- a/wiki/src/doc/first_steps/reset.pt.po
+++ b/wiki/src/doc/first_steps/reset.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
-msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Desinstalando o Tails ou resetando a memória USB\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index 8d2d2c1..8a34538 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-05 19:54+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Startup Options\"]]\n"
+msgid "[[!meta title=\"Startup options\"]]\n"
msgstr ""
#. type: Plain text
@@ -174,5 +174,5 @@ msgid "[[Set an administration password|administration_password]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Activate Windows Camouflage|windows_camouflage]]"
+msgid "[[Activate Windows camouflage|windows_camouflage]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index 5ff39a4..7c9da76 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-01-05 19:54+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2012-06-09 10:48-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Startup Options\"]]\n"
+msgid "[[!meta title=\"Startup options\"]]\n"
msgstr "[[!meta title=\"Options de démarrage\"]]\n"
#. type: Plain text
@@ -122,6 +122,10 @@ msgstr ""
"de démarrage</span>:\n"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"command\">bridge</span>, to activate the [[Tor bridge mode|"
+#| "bridge_mode]]"
msgid ""
"<span class=\"command\">bridge</span>, to activate the [[Tor Bridge Mode|"
"bridge_mode]]"
@@ -203,5 +207,5 @@ msgid "[[Set an administration password|administration_password]]"
msgstr "[[Définir un mot de passe administrateur|administration_password]]"
#. type: Bullet: ' - '
-msgid "[[Activate Windows Camouflage|windows_camouflage]]"
+msgid "[[Activate Windows camouflage|windows_camouflage]]"
msgstr "[[Activer le Camouflage Windows|windows_camouflage]]"
diff --git a/wiki/src/doc/first_steps/startup_options.mdwn b/wiki/src/doc/first_steps/startup_options.mdwn
index 298568e..5f4d41b 100644
--- a/wiki/src/doc/first_steps/startup_options.mdwn
+++ b/wiki/src/doc/first_steps/startup_options.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Startup Options"]]
+[[!meta title="Startup options"]]
When starting Tails, you can specify startup options to alter some of its basic
functioning. The two ways of specifying startup options are the following:
@@ -71,4 +71,4 @@ Here is a list of options that you can set using <span class="application">Tails
Greeter</span>:
- [[Set an administration password|administration_password]]
- - [[Activate Windows Camouflage|windows_camouflage]] \ No newline at end of file
+ - [[Activate Windows camouflage|windows_camouflage]]
diff --git a/wiki/src/doc/first_steps/startup_options.pt.po b/wiki/src/doc/first_steps/startup_options.pt.po
index df29a46..2660205 100644
--- a/wiki/src/doc/first_steps/startup_options.pt.po
+++ b/wiki/src/doc/first_steps/startup_options.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-05 19:54+0100\n"
+"POT-Creation-Date: 2014-02-25 14:36+0100\n"
"PO-Revision-Date: 2012-07-19 10:00+0100\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Startup Options\"]]\n"
+msgid "[[!meta title=\"Startup options\"]]\n"
msgstr "[[!meta title=\"Opções de Inicialização\"]]\n"
#. type: Plain text
@@ -125,6 +125,10 @@ msgstr ""
"de boot</span>:\n"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "<span class=\"command\">bridge</span>, to activate the [[Tor bridge mode|"
+#| "bridge_mode]]"
msgid ""
"<span class=\"command\">bridge</span>, to activate the [[Tor Bridge Mode|"
"bridge_mode]]"
@@ -207,7 +211,7 @@ msgid "[[Set an administration password|administration_password]]"
msgstr "[[Configure uma senha de administrador|administration_password]]"
#. type: Bullet: ' - '
-msgid "[[Activate Windows Camouflage|windows_camouflage]]"
+msgid "[[Activate Windows camouflage|windows_camouflage]]"
msgstr "[[Ative a Camuflagem Windows|windows_camouflage]]"
#, fuzzy
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
index 2966c04..2cd65e7 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Tor Bridge Mode\"]]\n"
+msgid "[[!meta title=\"Tor bridge mode\"]]\n"
msgstr "[[!meta title=\"Tor Bridge Modus\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
index e86c73d..64b11b0 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Tor Bridge Mode\"]]\n"
+msgid "[[!meta title=\"Tor bridge mode\"]]\n"
msgstr "[[!meta title=\"Tor en mode bridge\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn b/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
index 2757c72..17a5afe 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Tor Bridge Mode"]]
+[[!meta title="Tor bridge mode"]]
[[!toc levels=1]]
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po
index e1eb877..2a0128d 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Tor Bridge Mode\"]]\n"
+msgid "[[!meta title=\"Tor bridge mode\"]]\n"
msgstr "[[!meta title=\"Modo Bridge do Tor\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po b/wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po
index 4e9c5c9..db38f3c 100644
--- a/wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po
+++ b/wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Windows Camouflage\"]]\n"
-msgstr "[[!meta title=\"Windows Camouflage\"]]\n"
+msgid "[[!meta title=\"Windows camouflage\"]]\n"
+msgstr "[[!meta title=\"Windows camouflage\"]]\n"
#. type: Plain text
msgid ""
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"When Tails is starting up the Windows Camouflage can be activated in\n"
+"When Tails is starting up the Windows camouflage can be activated in\n"
"[[<span class=\"application\">Tails greeter</span>|startup_options#tails_greeter]]\n"
"by choosing <span class=\"button\">Yes</span> to <span\n"
"class=\"button\">More options?</span> and then enabling the checkbox\n"
diff --git a/wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po b/wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po
index c80765d..2c52551 100644
--- a/wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Windows Camouflage\"]]\n"
+msgid "[[!meta title=\"Windows camouflage\"]]\n"
msgstr "[[!meta title=\"Camouflage Windows\"]]\n"
#. type: Plain text
@@ -34,7 +34,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"When Tails is starting up the Windows Camouflage can be activated in\n"
+"When Tails is starting up the Windows camouflage can be activated in\n"
"[[<span class=\"application\">Tails greeter</span>|startup_options#tails_greeter]]\n"
"by choosing <span class=\"button\">Yes</span> to <span\n"
"class=\"button\">More options?</span> and then enabling the checkbox\n"
diff --git a/wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn b/wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn
index c303b58..b40dea8 100644
--- a/wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn
@@ -1,10 +1,10 @@
-[[!meta title="Windows Camouflage"]]
+[[!meta title="Windows camouflage"]]
If you are using a computer in public you may want to avoid attracting
unwanted attention by changing the way Tails looks into something that
resembles Microsoft Windows XP.
-When Tails is starting up the Windows Camouflage can be activated in
+When Tails is starting up the Windows camouflage can be activated in
[[<span class="application">Tails greeter</span>|startup_options#tails_greeter]]
by choosing <span class="button">Yes</span> to <span
class="button">More options?</span> and then enabling the checkbox
diff --git a/wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po b/wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po
index cfdbe2c..89b472c 100644
--- a/wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Windows Camouflage\"]]\n"
+msgid "[[!meta title=\"Windows camouflage\"]]\n"
msgstr "[[!meta title=\"Camuflagem Windows\"]]\n"
#. type: Plain text
@@ -27,7 +27,7 @@ msgstr "Se você está usando um computador em público, você pode querer evita
#. type: Plain text
#, no-wrap
msgid ""
-"When Tails is starting up the Windows Camouflage can be activated in\n"
+"When Tails is starting up the Windows camouflage can be activated in\n"
"[[<span class=\"application\">Tails greeter</span>|startup_options#tails_greeter]]\n"
"by choosing <span class=\"button\">Yes</span> to <span\n"
"class=\"button\">More options?</span> and then enabling the checkbox\n"
diff --git a/wiki/src/doc/first_steps/upgrade.de.po b/wiki/src/doc/first_steps/upgrade.de.po
index d67d198..f79fa5d 100644
--- a/wiki/src/doc/first_steps/upgrade.de.po
+++ b/wiki/src/doc/first_steps/upgrade.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-17 12:49+0100\n"
+"POT-Creation-Date: 2014-02-18 15:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,8 @@ msgstr ""
msgid ""
"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
"Upgrader</span> automatically checks if upgrades are available and then\n"
-"proposes you to upgrade your device.\n"
+"proposes you to upgrade your device. The upgrades are checked for and downloaded\n"
+"through Tor.\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index 6b3ae1d..7eb0eb1 100644
--- a/wiki/src/doc/first_steps/upgrade.fr.po
+++ b/wiki/src/doc/first_steps/upgrade.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-01-17 12:49+0100\n"
+"POT-Creation-Date: 2014-02-18 15:08+0100\n"
"PO-Revision-Date: 2014-01-17 12:49+0100\n"
"Last-Translator: saegor <saegor@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,11 +95,16 @@ msgid "Automatic upgrade using <span class=\"application\">Tails Upgrader</span>
msgstr "Mise à jour automatique avec le <span class=\"application\">Tails Upgrader</span>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
+#| "Upgrader</span> automatically checks if upgrades are available and then\n"
+#| "proposes you to upgrade your device.\n"
msgid ""
"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
"Upgrader</span> automatically checks if upgrades are available and then\n"
-"proposes you to upgrade your device.\n"
+"proposes you to upgrade your device. The upgrades are checked for and downloaded\n"
+"through Tor.\n"
msgstr ""
"Après le démarrage de Tails et la connexion à Tor, le <span class=\"application\">Tails\n"
"Upgrader</span> vérifie automatiquement si des mises à jour sont disponibles\n"
diff --git a/wiki/src/doc/first_steps/upgrade.mdwn b/wiki/src/doc/first_steps/upgrade.mdwn
index 2172056..cad100e 100644
--- a/wiki/src/doc/first_steps/upgrade.mdwn
+++ b/wiki/src/doc/first_steps/upgrade.mdwn
@@ -33,7 +33,8 @@ Automatic upgrade using <span class="application">Tails Upgrader</span>
After starting Tails and connecting to Tor, <span class="application">Tails
Upgrader</span> automatically checks if upgrades are available and then
-proposes you to upgrade your device.
+proposes you to upgrade your device. The upgrades are checked for and downloaded
+through Tor.
The advantages of this technique are the following:
diff --git a/wiki/src/doc/first_steps/upgrade.pt.po b/wiki/src/doc/first_steps/upgrade.pt.po
index 0b53fc2..b7caf02 100644
--- a/wiki/src/doc/first_steps/upgrade.pt.po
+++ b/wiki/src/doc/first_steps/upgrade.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-17 12:49+0100\n"
+"POT-Creation-Date: 2014-02-18 15:08+0100\n"
"PO-Revision-Date: 2012-07-11 15:21+0100\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,7 +94,8 @@ msgstr ""
msgid ""
"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
"Upgrader</span> automatically checks if upgrades are available and then\n"
-"proposes you to upgrade your device.\n"
+"proposes you to upgrade your device. The upgrades are checked for and downloaded\n"
+"through Tor.\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/upgrade/error/check.de.po b/wiki/src/doc/upgrade/error/check.de.po
index d8e7f7d..ecd88d3 100644
--- a/wiki/src/doc/upgrade/error/check.de.po
+++ b/wiki/src/doc/upgrade/error/check.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-10 15:58+0100\n"
+"POT-Creation-Date: 2014-02-21 12:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,6 +31,25 @@ msgid "This is probably caused by a network connection problem."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid "<div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Tails 0.22.1, <span class=\"application\">Tails Upgrader</span> sometimes\n"
+"fails to check for upgrades even if the computer is correctly connected to\n"
+"Internet because it starts before Tor is ready. In this case, try to do the\n"
+"upgrade from another network or another computer.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/check.fr.po b/wiki/src/doc/upgrade/error/check.fr.po
index fd296c4..03e7f0f 100644
--- a/wiki/src/doc/upgrade/error/check.fr.po
+++ b/wiki/src/doc/upgrade/error/check.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-01-29 15:32+0100\n"
+"POT-Creation-Date: 2014-02-21 12:12+0100\n"
"PO-Revision-Date: 2014-01-16 21:10-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,25 @@ msgid "This is probably caused by a network connection problem."
msgstr "Ceci est probablement dû à un problème de connexion réseau."
#. type: Plain text
+#, no-wrap
+msgid "<div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Tails 0.22.1, <span class=\"application\">Tails Upgrader</span> sometimes\n"
+"fails to check for upgrades even if the computer is correctly connected to\n"
+"Internet because it starts before Tor is ready. In this case, try to do the\n"
+"upgrade from another network or another computer.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/check.mdwn b/wiki/src/doc/upgrade/error/check.mdwn
index 67b8ee8..4e56704 100644
--- a/wiki/src/doc/upgrade/error/check.mdwn
+++ b/wiki/src/doc/upgrade/error/check.mdwn
@@ -4,6 +4,15 @@ Tails could not determine whether an upgrade is available from our website.
This is probably caused by a network connection problem.
+<div class="bug">
+
+<p>In Tails 0.22.1, <span class="application">Tails Upgrader</span> sometimes
+fails to check for upgrades even if the computer is correctly connected to
+Internet because it starts before Tor is ready. In this case, try to do the
+upgrade from another network or another computer.</p>
+
+</div>
+
Check your network connection, and restart Tails to check for upgrades again.
If the problem persists, [[report an error|support/troubleshooting]] and include
diff --git a/wiki/src/doc/upgrade/error/check.pt.po b/wiki/src/doc/upgrade/error/check.pt.po
index d8e7f7d..ecd88d3 100644
--- a/wiki/src/doc/upgrade/error/check.pt.po
+++ b/wiki/src/doc/upgrade/error/check.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-10 15:58+0100\n"
+"POT-Creation-Date: 2014-02-21 12:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,6 +31,25 @@ msgid "This is probably caused by a network connection problem."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid "<div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Tails 0.22.1, <span class=\"application\">Tails Upgrader</span> sometimes\n"
+"fails to check for upgrades even if the computer is correctly connected to\n"
+"Internet because it starts before Tor is ready. In this case, try to do the\n"
+"upgrade from another network or another computer.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
diff --git a/wiki/src/news.de.po b/wiki/src/news.de.po
index 2e8e3be..013950a 100644
--- a/wiki/src/news.de.po
+++ b/wiki/src/news.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
+"POT-Creation-Date: 2014-02-26 07:47+0100\n"
"PO-Revision-Date: 2013-06-25 10:45+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr ""
#, no-wrap
msgid ""
"- Subscribe to the [amnesia-news mailing\n"
-" list](https://boum.org/mailman/listinfo/amnesia-news) to receive the same news\n"
+" list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news\n"
" by email:\n"
" <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
" <input class=\"text\" name=\"email\" value=\"\"/>\n"
diff --git a/wiki/src/news.fr.po b/wiki/src/news.fr.po
index ec07f59..03dc6f7 100644
--- a/wiki/src/news.fr.po
+++ b/wiki/src/news.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
+"POT-Creation-Date: 2014-02-26 07:47+0100\n"
"PO-Revision-Date: 2013-10-21 12:38+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,7 +56,7 @@ msgstr ""
#| " - follow us on Twitter [@Tails_live](https://twitter.com/tails_live).\n"
msgid ""
"- Subscribe to the [amnesia-news mailing\n"
-" list](https://boum.org/mailman/listinfo/amnesia-news) to receive the same news\n"
+" list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news\n"
" by email:\n"
" <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
" <input class=\"text\" name=\"email\" value=\"\"/>\n"
diff --git a/wiki/src/news.mdwn b/wiki/src/news.mdwn
index 29dab5d..267adb7 100644
--- a/wiki/src/news.mdwn
+++ b/wiki/src/news.mdwn
@@ -8,7 +8,7 @@
</div>
- Subscribe to the [amnesia-news mailing
- list](https://boum.org/mailman/listinfo/amnesia-news) to receive the same news
+ list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news
by email:
<form method="POST" action="https://mailman.boum.org/subscribe/amnesia-news">
<input class="text" name="email" value=""/>
diff --git a/wiki/src/news.pt.po b/wiki/src/news.pt.po
index 2c6c53d..40a8810 100644
--- a/wiki/src/news.pt.po
+++ b/wiki/src/news.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
+"POT-Creation-Date: 2014-02-26 07:47+0100\n"
"PO-Revision-Date: 2012-11-15 03:50+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"- Subscribe to the [amnesia-news mailing\n"
-" list](https://boum.org/mailman/listinfo/amnesia-news) to receive the same news\n"
+" list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news\n"
" by email:\n"
" <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
" <input class=\"text\" name=\"email\" value=\"\"/>\n"
diff --git a/wiki/src/news/spoof-mac.de.po b/wiki/src/news/spoof-mac.de.po
index 59317cc..523ae80 100644
--- a/wiki/src/news/spoof-mac.de.po
+++ b/wiki/src/news/spoof-mac.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-29 16:34+0100\n"
+"POT-Creation-Date: 2014-02-21 20:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,17 +28,17 @@ msgstr ""
#. type: Plain text
msgid ""
-"You can help Tails! The [[MAC address "
-"spoofing|contribute/design/MAC_address]] feature is ready for testing. This "
-"feature prevents geographical tracking of your network devices (and by "
-"extension, you) by randomising their [[!wikipedia MAC addresses]]."
+"You can help Tails! The [[MAC address spoofing|contribute/design/"
+"MAC_address]] feature is ready for testing. This feature prevents "
+"geographical tracking of your network devices (and by extension, you) by "
+"randomising their [[!wikipedia MAC addresses]]."
msgstr ""
#. type: Plain text
msgid ""
"If you have security auditing skills you are more than welcome to review our "
-"[[design|contribute/design/MAC_address]] and "
-"[[implementation|contribute/design/MAC_address#implementation]]."
+"[[design|contribute/design/MAC_address]] and [[implementation|contribute/"
+"design/MAC_address#implementation]]."
msgstr ""
#. type: Plain text
@@ -61,8 +61,8 @@ msgid ""
"and time ties the corresponding device to the same location and time. If the "
"real identity of the device's owner is known, their movements can be "
"determined. To prevent this one can temporarily change the MAC address to "
-"something random at each boot, which is referred to as \"MAC address "
-"spoofing\"."
+"something random at each boot, which is referred to as \"MAC address spoofing"
+"\"."
msgstr ""
#. type: Title #
@@ -72,17 +72,16 @@ msgstr ""
#. type: Plain text
msgid ""
-"Download the latest test ISO from "
-"[build_Tails_ISO_feature-spoof-mac](http://nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/). "
-"**Keep in mind that this is a test image.** Do not use it for anything else "
-"than testing this feature."
+"Download the latest test ISO from [build_Tails_ISO_devel](http://nightly."
+"tails.boum.org/build_Tails_ISO_devel/). **Keep in mind that this is a test "
+"image.** Do not use it for anything else than testing this feature."
msgstr ""
#. type: Plain text
msgid ""
"To verify the download, use the `.shasum` file. It is signed with OpenPGP "
-"key "
-"[0xD83A438B2F916605](http://keys.indymedia.org/pks/lookup?op=get&fingerprint=on&search=0xD83A438B2F916605)."
+"key [0xD83A438B2F916605](http://keys.indymedia.org/pks/lookup?"
+"op=get&fingerprint=on&search=0xD83A438B2F916605)."
msgstr ""
#. type: Title #
@@ -109,8 +108,8 @@ msgstr ""
msgid ""
"For any MAC spoofing-related issues you experience using this test ISO, "
"please include the output from the following commands when reporting it to "
-"us (note: it requires setting an "
-"[[doc/first_steps/startup_options/administration_password]]):"
+"us (note: it requires setting an [[doc/first_steps/startup_options/"
+"administration_password]]):"
msgstr ""
#. type: Plain text
@@ -148,7 +147,8 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid "For each network device you'll get an entry looking something like this:"
+msgid ""
+"For each network device you'll get an entry looking something like this:"
msgstr ""
#. type: Plain text
@@ -162,8 +162,8 @@ msgstr ""
#. type: Plain text
msgid ""
"The \"Permanent MAC\" is the network device's \"real\", unique MAC address; "
-"the \"Current MAC\" is whatever it is set to at the moment, spoofed or "
-"not. In other words:"
+"the \"Current MAC\" is whatever it is set to at the moment, spoofed or not. "
+"In other words:"
msgstr ""
#. type: Bullet: '* '
@@ -196,8 +196,8 @@ msgstr ""
msgid ""
"If you have access to a wireless network that employs MAC address "
"whitelisting, then connect to it with MAC spoofing enabled and verify that "
-"Tails shows a notification with the headline: \"Network connection "
-"blocked?\"."
+"Tails shows a notification with the headline: \"Network connection blocked?"
+"\"."
msgstr ""
#. type: Plain text
@@ -216,8 +216,7 @@ msgid ""
"Please report all network device and connection issues, e.g. if any of your "
"network devices do not get detected by Tails at all, if the network "
"connection fails, or if the network connection succeeds but actually does "
-"not work. Also check whether you experience the same issues using Tails "
-"0.22."
+"not work. Also check whether you experience the same issues using Tails 0.22."
msgstr ""
#. type: Title #
diff --git a/wiki/src/news/spoof-mac.fr.po b/wiki/src/news/spoof-mac.fr.po
index 8f5234c..58dc2eb 100644
--- a/wiki/src/news/spoof-mac.fr.po
+++ b/wiki/src/news/spoof-mac.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-07 17:16+0100\n"
+"POT-Creation-Date: 2014-02-21 20:25+0100\n"
"PO-Revision-Date: 2014-01-03 14:41-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,11 +91,16 @@ msgid "How to download the test image"
msgstr "Comment télécharger l'image de test"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Download the latest test ISO from [build_Tails_ISO_feature-spoof-mac]"
+#| "(http://nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/). "
+#| "**Keep in mind that this is a test image.** Do not use it for anything "
+#| "else than testing this feature."
msgid ""
-"Download the latest test ISO from [build_Tails_ISO_feature-spoof-mac](http://"
-"nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/). **Keep in mind "
-"that this is a test image.** Do not use it for anything else than testing "
-"this feature."
+"Download the latest test ISO from [build_Tails_ISO_devel](http://nightly."
+"tails.boum.org/build_Tails_ISO_devel/). **Keep in mind that this is a test "
+"image.** Do not use it for anything else than testing this feature."
msgstr ""
"Téléchargez la dernière ISO de test depuis [build_Tails_ISO_feature-spoof-"
"mac](http://nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/)."
diff --git a/wiki/src/news/spoof-mac.mdwn b/wiki/src/news/spoof-mac.mdwn
index 342f47a..4b669bb 100644
--- a/wiki/src/news/spoof-mac.mdwn
+++ b/wiki/src/news/spoof-mac.mdwn
@@ -30,7 +30,7 @@ each boot, which is referred to as "MAC address spoofing".
# How to download the test image
Download the latest test ISO from
-[build_Tails_ISO_feature-spoof-mac](http://nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/). **Keep
+[build_Tails_ISO_devel](http://nightly.tails.boum.org/build_Tails_ISO_devel/). **Keep
in mind that this is a test image.** Do not use it for anything else
than testing this feature.
diff --git a/wiki/src/news/spoof-mac.pt.po b/wiki/src/news/spoof-mac.pt.po
index 59317cc..523ae80 100644
--- a/wiki/src/news/spoof-mac.pt.po
+++ b/wiki/src/news/spoof-mac.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-29 16:34+0100\n"
+"POT-Creation-Date: 2014-02-21 20:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,17 +28,17 @@ msgstr ""
#. type: Plain text
msgid ""
-"You can help Tails! The [[MAC address "
-"spoofing|contribute/design/MAC_address]] feature is ready for testing. This "
-"feature prevents geographical tracking of your network devices (and by "
-"extension, you) by randomising their [[!wikipedia MAC addresses]]."
+"You can help Tails! The [[MAC address spoofing|contribute/design/"
+"MAC_address]] feature is ready for testing. This feature prevents "
+"geographical tracking of your network devices (and by extension, you) by "
+"randomising their [[!wikipedia MAC addresses]]."
msgstr ""
#. type: Plain text
msgid ""
"If you have security auditing skills you are more than welcome to review our "
-"[[design|contribute/design/MAC_address]] and "
-"[[implementation|contribute/design/MAC_address#implementation]]."
+"[[design|contribute/design/MAC_address]] and [[implementation|contribute/"
+"design/MAC_address#implementation]]."
msgstr ""
#. type: Plain text
@@ -61,8 +61,8 @@ msgid ""
"and time ties the corresponding device to the same location and time. If the "
"real identity of the device's owner is known, their movements can be "
"determined. To prevent this one can temporarily change the MAC address to "
-"something random at each boot, which is referred to as \"MAC address "
-"spoofing\"."
+"something random at each boot, which is referred to as \"MAC address spoofing"
+"\"."
msgstr ""
#. type: Title #
@@ -72,17 +72,16 @@ msgstr ""
#. type: Plain text
msgid ""
-"Download the latest test ISO from "
-"[build_Tails_ISO_feature-spoof-mac](http://nightly.tails.boum.org/build_Tails_ISO_feature-spoof-mac/). "
-"**Keep in mind that this is a test image.** Do not use it for anything else "
-"than testing this feature."
+"Download the latest test ISO from [build_Tails_ISO_devel](http://nightly."
+"tails.boum.org/build_Tails_ISO_devel/). **Keep in mind that this is a test "
+"image.** Do not use it for anything else than testing this feature."
msgstr ""
#. type: Plain text
msgid ""
"To verify the download, use the `.shasum` file. It is signed with OpenPGP "
-"key "
-"[0xD83A438B2F916605](http://keys.indymedia.org/pks/lookup?op=get&fingerprint=on&search=0xD83A438B2F916605)."
+"key [0xD83A438B2F916605](http://keys.indymedia.org/pks/lookup?"
+"op=get&fingerprint=on&search=0xD83A438B2F916605)."
msgstr ""
#. type: Title #
@@ -109,8 +108,8 @@ msgstr ""
msgid ""
"For any MAC spoofing-related issues you experience using this test ISO, "
"please include the output from the following commands when reporting it to "
-"us (note: it requires setting an "
-"[[doc/first_steps/startup_options/administration_password]]):"
+"us (note: it requires setting an [[doc/first_steps/startup_options/"
+"administration_password]]):"
msgstr ""
#. type: Plain text
@@ -148,7 +147,8 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid "For each network device you'll get an entry looking something like this:"
+msgid ""
+"For each network device you'll get an entry looking something like this:"
msgstr ""
#. type: Plain text
@@ -162,8 +162,8 @@ msgstr ""
#. type: Plain text
msgid ""
"The \"Permanent MAC\" is the network device's \"real\", unique MAC address; "
-"the \"Current MAC\" is whatever it is set to at the moment, spoofed or "
-"not. In other words:"
+"the \"Current MAC\" is whatever it is set to at the moment, spoofed or not. "
+"In other words:"
msgstr ""
#. type: Bullet: '* '
@@ -196,8 +196,8 @@ msgstr ""
msgid ""
"If you have access to a wireless network that employs MAC address "
"whitelisting, then connect to it with MAC spoofing enabled and verify that "
-"Tails shows a notification with the headline: \"Network connection "
-"blocked?\"."
+"Tails shows a notification with the headline: \"Network connection blocked?"
+"\"."
msgstr ""
#. type: Plain text
@@ -216,8 +216,7 @@ msgid ""
"Please report all network device and connection issues, e.g. if any of your "
"network devices do not get detected by Tails at all, if the network "
"connection fails, or if the network connection succeeds but actually does "
-"not work. Also check whether you experience the same issues using Tails "
-"0.22."
+"not work. Also check whether you experience the same issues using Tails 0.22."
msgstr ""
#. type: Title #
diff --git a/wiki/src/shortcuts.mdwn b/wiki/src/shortcuts.mdwn
index da7fbf1..cbcb93e 100644
--- a/wiki/src/shortcuts.mdwn
+++ b/wiki/src/shortcuts.mdwn
@@ -91,7 +91,7 @@ ikiwiki will include your shortcut in the standard underlay.
* [[!shortcut name=tails_bug url="https://tails.boum.org/bugs/%s"]]
* [[!shortcut name=tails_redmine url="https://labs.riseup.net/code/projects/tails/issues?query_id=108"]]
* [[!shortcut name=tails_redmine_easy
- url="https://labs.riseup.net/code/projects/tails/issues?query_id=112"
+ url="https://labs.riseup.net/code/projects/tails/issues?per_page=200&query_id=112"
desc="list of easy tasks"]]
* [[!shortcut name=tails_ticket url="https://labs.riseup.net/code/issues/%s" desc="ticket #%s"]]
* [[!shortcut name=tails_roadmap url="https://labs.riseup.net/code/projects/tails/roadmap" desc="roadmap"]]
@@ -102,6 +102,7 @@ ikiwiki will include your shortcut in the standard underlay.
* [[!shortcut name=tails_spoof-mac_gitweb url="https://git-tails.immerda.ch/tails/plain/%S?h=feature/spoof-mac"]]
* [[!shortcut name=tails_gitweb_branch url="https://git-tails.immerda.ch/tails/log/?h=%S"]]
* [[!shortcut name=tails_gitweb_commit url="https://git-tails.immerda.ch/tails/commit/?id=%s"]]
+* [[!shortcut name=greeter_gitweb url="https://git-tails.immerda.ch/greeter/plain/%S"]]
* [[!shortcut name=launchpad_bug url="https://bugs.launchpad.net/onboard/+bug/%s" desc="Launchpad bug #%s"]]
* [[!shortcut name=tor_bug
url="https://trac.torproject.org/projects/tor/ticket/%s" desc="bug #%s on Tor Project's Trac"]]
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index d3d18e5..dab6c7e 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
+"POT-Creation-Date: 2014-02-17 16:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,9 +145,11 @@ msgid ""
"screen and locked up keyboard."
msgstr ""
-#. type: Title -
+#. type: Plain text
#, no-wrap
-msgid "ThinkPad X121e, X220, X230, T420i, T430, T520, T530 and E325\n"
+msgid ""
+"ThinkPad X121e, X220, X230, T420i, T430, T520, W520, T530 and E325\n"
+"------------------------------------------------------------\n"
msgstr ""
#. type: Plain text
@@ -208,7 +210,7 @@ msgid "SanDisk Cruzer Extreme USB 3.0 16GB and 32GB"
msgstr ""
#. type: Bullet: '* '
-msgid "SanDisk Cruzer Fit USB 2.0 8GB"
+msgid "SanDisk Cruzer Fit USB 2.0 8GB and 16GB"
msgstr ""
#. type: Bullet: '* '
@@ -227,6 +229,10 @@ msgstr ""
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr ""
+#. type: Bullet: '* '
+msgid "Sandisk Cruzer Blade 4GB"
+msgstr ""
+
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 8033b2a..4a34c5b 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -6,11 +6,10 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
-"PO-Revision-Date: 2014-01-24 14:21-0000\n"
+"POT-Creation-Date: 2014-02-17 16:33+0100\n"
+"PO-Revision-Date: 2014-02-17 16:31-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"
@@ -170,11 +169,15 @@ msgstr ""
"Ne démarre ni sur USB ni sur DVD. Le système plante avec un écran vide et un "
"clavier verrouillé."
-#. type: Title -
-#, fuzzy, no-wrap
+#. type: Plain text
+#, no-wrap
#| msgid "ThinkPad X220, X230, T420i, T430, T520, T530 and E325\n"
-msgid "ThinkPad X121e, X220, X230, T420i, T430, T520, T530 and E325\n"
-msgstr "ThinkPad X220, X230, T420i, T430, T520, T530 et E325\n"
+msgid ""
+"ThinkPad X121e, X220, X230, T420i, T430, T520, W520, T530 and E325\n"
+"------------------------------------------------------------\n"
+msgstr ""
+"ThinkPad X121e, X220, X230, T420i, T430, T520, W520, T530 et E325\n"
+"------------------------------------------------------------\n"
#. type: Plain text
msgid ""
@@ -191,7 +194,7 @@ msgid ""
"this technique does not allow you to set up a persistent volume."
msgstr ""
" Une solution alternative pour certaines de ces machines est d'utiliser le "
-"[[procédé d'installation manuelle||doc/first_steps/installation/manual/"
+"[[procédé d'installation manuelle|doc/first_steps/installation/manual/"
"linux]]. Notez cependant que cette technique ne permet pas de configurer un "
"volume persistant."
@@ -247,8 +250,9 @@ msgid "SanDisk Cruzer Extreme USB 3.0 16GB and 32GB"
msgstr "SanDisk Cruzer Extreme USB 3.0 16GB et 32GB"
#. type: Bullet: '* '
-msgid "SanDisk Cruzer Fit USB 2.0 8GB"
-msgstr "SanDisk Cruzer Fit USB 2.0 8GB"
+#| msgid "SanDisk Cruzer Switch USB 2.0 8GB and 32GB"
+msgid "SanDisk Cruzer Fit USB 2.0 8GB and 16GB"
+msgstr "SanDisk Cruzer Fit USB 2.0 8GB et 16GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Force 8GB"
@@ -266,6 +270,11 @@ msgstr "SanDisk Cruzer Switch USB 2.0 8GB et 32GB"
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr "SanDisk Cruzer USB 3.0 64GB"
+#. type: Bullet: '* '
+#| msgid "SanDisk Cruzer Edge 8GB"
+msgid "Sandisk Cruzer Blade 4GB"
+msgstr "Sandisk Cruzer Blade 4GB"
+
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
@@ -616,7 +625,7 @@ msgstr "Ouvrir le navigateur web de nouveau."
#. type: Title -
#, no-wrap
msgid "TorBrowser takes too long to shutdown\n"
-msgstr ""
+msgstr "Le navigateur Tor met trop longtemps à s'éteindre\n"
#. type: Plain text
msgid ""
@@ -624,6 +633,12 @@ msgid ""
"tails_ticket 6480]]). Waiting a few more seconds is usually enough to let it "
"close itself correctly."
msgstr ""
+"Depuis Tails 0.22, le navigateur prend parfois beaucoup de temps à "
+"s'éteindre ([[!tails_ticket 6480]]). Patienter quelques secondes de plus est "
+"généralement suffisant pour qu'il se ferme tout seul correctement."
+
+#~ msgid "SanDisk Cruzer Fit USB 2.0 8GB"
+#~ msgstr "SanDisk Cruzer Fit USB 2.0 8GB"
#~ msgid "Some machines have been reported to have problems starting Tails."
#~ msgstr ""
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index dd01fcb..7a0cb02 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -69,7 +69,7 @@ Dell Dimension 2400
Cannot start neither from USB nor from DVD. System crashes with a blank
screen and locked up keyboard.
-ThinkPad X121e, X220, X230, T420i, T430, T520, T530 and E325
+ThinkPad X121e, X220, X230, T420i, T430, T520, W520, T530 and E325
------------------------------------------------------------
These machines do not start on USB sticks created using Tails USB
@@ -100,11 +100,12 @@ dangerous|doc/first_steps/bug_reporting/tails_does_not_start#entirely]].
* SanDisk Cruzer Edge 8GB
* SanDisk Cruzer Extreme USB 3.0 16GB and 32GB
-* SanDisk Cruzer Fit USB 2.0 8GB
+* SanDisk Cruzer Fit USB 2.0 8GB and 16GB
* SanDisk Cruzer Force 8GB
* SanDisk Cruzer Glide 4GB, 8GB and 16GB
* SanDisk Cruzer Switch USB 2.0 8GB and 32GB
* SanDisk Cruzer USB 3.0 64GB
+* Sandisk Cruzer Blade 4GB
SanDisk had begun the production of flash drives configured as fixed disk in
2012 to meet new requirements for Windows 8 Certification. The flash drives that
@@ -242,18 +243,6 @@ Touchpad configurations
synclient FingerLow=1;
synclient FingerHigh=1;
-New Identity feature
---------------------
-
-Since Tails 0.21, the "New Identity" feature in the web browser is not
-available anymore ([[!tails_ticket 6383]]).
-
-As a workaround it is possible to:
-
- 1. Close the web browser.
- 2. Right-click on the Vidalia icon and choose "New identity".
- 3. Open the web browser again.
-
TorBrowser takes too long to shutdown
-------------------------------------
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index d3d18e5..dab6c7e 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-10 14:12+0100\n"
+"POT-Creation-Date: 2014-02-17 16:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,9 +145,11 @@ msgid ""
"screen and locked up keyboard."
msgstr ""
-#. type: Title -
+#. type: Plain text
#, no-wrap
-msgid "ThinkPad X121e, X220, X230, T420i, T430, T520, T530 and E325\n"
+msgid ""
+"ThinkPad X121e, X220, X230, T420i, T430, T520, W520, T530 and E325\n"
+"------------------------------------------------------------\n"
msgstr ""
#. type: Plain text
@@ -208,7 +210,7 @@ msgid "SanDisk Cruzer Extreme USB 3.0 16GB and 32GB"
msgstr ""
#. type: Bullet: '* '
-msgid "SanDisk Cruzer Fit USB 2.0 8GB"
+msgid "SanDisk Cruzer Fit USB 2.0 8GB and 16GB"
msgstr ""
#. type: Bullet: '* '
@@ -227,6 +229,10 @@ msgstr ""
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr ""
+#. type: Bullet: '* '
+msgid "Sandisk Cruzer Blade 4GB"
+msgstr ""
+
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
diff --git a/wiki/src/support/tails-support.de.po b/wiki/src/support/tails-support.de.po
index b03f0b4..3d21e3a 100644
--- a/wiki/src/support/tails-support.de.po
+++ b/wiki/src/support/tails-support.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-12 18:30+0300\n"
+"POT-Creation-Date: 2014-02-19 12:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"**Feature requests**: those should be done on the development mailing list "
+"**Feature requests**: those should be done on the development mailing list: "
"[tails-dev@boum.org](https://mailman.boum.org/listinfo/tails-dev/)."
msgstr ""
diff --git a/wiki/src/support/tails-support.fr.po b/wiki/src/support/tails-support.fr.po
index b704fa4..5fb438a 100644
--- a/wiki/src/support/tails-support.fr.po
+++ b/wiki/src/support/tails-support.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-09 13:08+0200\n"
+"POT-Creation-Date: 2014-02-19 12:22+0100\n"
"PO-Revision-Date: 2013-08-15 20:58-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,8 +64,12 @@ msgstr ""
"de bug|/doc/first_steps/bug_reporting]]."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "**Feature requests**: those should be done on the development mailing "
+#| "list [tails-dev@boum.org](https://mailman.boum.org/listinfo/tails-dev/)."
msgid ""
-"**Feature requests**: those should be done on the development mailing list "
+"**Feature requests**: those should be done on the development mailing list: "
"[tails-dev@boum.org](https://mailman.boum.org/listinfo/tails-dev/)."
msgstr ""
"**Les demandes de fonctionnalité** : cela doit être fait sur la liste mail "
diff --git a/wiki/src/support/tails-support.mdwn b/wiki/src/support/tails-support.mdwn
index 611768d..ceae132 100644
--- a/wiki/src/support/tails-support.mdwn
+++ b/wiki/src/support/tails-support.mdwn
@@ -16,7 +16,7 @@ This list is **the wrong place** for:
- **Bug reports**: see the [[bug reporting
documentation|/doc/first_steps/bug_reporting]] instead.
- **Feature requests**: those should be done on the development
- mailing list
+ mailing list:
[tails-dev@boum.org](https://mailman.boum.org/listinfo/tails-dev/).
- **Computer security essays and conspiranoia** not directly related
to Tails.
diff --git a/wiki/src/support/tails-support.pt.po b/wiki/src/support/tails-support.pt.po
index b03f0b4..3d21e3a 100644
--- a/wiki/src/support/tails-support.pt.po
+++ b/wiki/src/support/tails-support.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-12 18:30+0300\n"
+"POT-Creation-Date: 2014-02-19 12:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"**Feature requests**: those should be done on the development mailing list "
+"**Feature requests**: those should be done on the development mailing list: "
"[tails-dev@boum.org](https://mailman.boum.org/listinfo/tails-dev/)."
msgstr ""
diff --git a/wiki/src/support/talk.de.po b/wiki/src/support/talk.de.po
index a097e73..efb16cb 100644
--- a/wiki/src/support/talk.de.po
+++ b/wiki/src/support/talk.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-19 11:58+0300\n"
+"POT-Creation-Date: 2014-02-25 18:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgstr ""
#. type: Content of: <div><p>
#, fuzzy
#| msgid "If you want to talk to Tails developers or users:"
-msgid "Join our IRC channel to chat with developers and users."
+msgid "Join our IRC channel to chat with contributors and users."
msgstr ""
"Wenn du mit den Tails-Entwicklern und -Benutzern sprechen möchtest, dann..."
diff --git a/wiki/src/support/talk.fr.po b/wiki/src/support/talk.fr.po
index 7b62ae0..56ca603 100644
--- a/wiki/src/support/talk.fr.po
+++ b/wiki/src/support/talk.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-talk-users-fr\n"
-"POT-Creation-Date: 2013-09-19 11:58+0300\n"
+"POT-Creation-Date: 2014-02-25 18:25+0100\n"
"PO-Revision-Date: 2013-08-12 11:04-0000\n"
"Last-Translator: \n"
"Language-Team: nada-fr <LL@li.org>\n"
@@ -52,7 +52,9 @@ msgid "[[!img lib/chat.png link=no]]"
msgstr ""
#. type: Content of: <div><p>
-msgid "Join our IRC channel to chat with developers and users."
+#, fuzzy
+#| msgid "Join our IRC channel to chat with developers and users."
+msgid "Join our IRC channel to chat with contributors and users."
msgstr ""
"Rejoignez notre salon IRC pour discuter avec les développeurs et les\n"
"utilisateurs de Tails."
diff --git a/wiki/src/support/talk.html b/wiki/src/support/talk.html
index e28f7ba..e8562de 100644
--- a/wiki/src/support/talk.html
+++ b/wiki/src/support/talk.html
@@ -1,6 +1,6 @@
[[!meta title="Get in touch with us"]]
-<div id="talk-forum" class="three-blocks">
+<div id="talk-support-list" class="three-blocks">
<h3>Support list</h3>
[[!img lib/forum.png link=no]]
@@ -18,7 +18,7 @@ IP address, email subject and content, etc.</p>
<h3>Chat</h3>
[[!img lib/chat.png link=no]]
-<p>Join our IRC channel to chat with developers and users.</p>
+<p>Join our IRC channel to chat with contributors and users.</p>
<ul>
<li>server: <code>irc.oftc.net</code></li>
diff --git a/wiki/src/support/talk.pt.po b/wiki/src/support/talk.pt.po
index b8c9a78..9fa4f9a 100644
--- a/wiki/src/support/talk.pt.po
+++ b/wiki/src/support/talk.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-19 11:58+0300\n"
+"POT-Creation-Date: 2014-02-25 18:25+0100\n"
"PO-Revision-Date: 2012-09-27 08:29-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,7 +49,7 @@ msgstr "[[!img lib/chat.png link=no]]"
#. type: Content of: <div><p>
#, fuzzy
#| msgid "Join our IRC channel to chat with developpers and users."
-msgid "Join our IRC channel to chat with developers and users."
+msgid "Join our IRC channel to chat with contributors and users."
msgstr ""
"Entre no nosso canal IRC para conversar com desenvolvedores e usuários/as."