summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramnesia <amnesia@boum.org>2010-10-02 23:10:32 +0200
committeramnesia <amnesia@boum.org>2010-10-02 23:10:32 +0200
commiteb3de0438da4e81b056064e6e38d9a667c2ed4a0 (patch)
treed8b5a31d4bd39601082f830d37ec3b2e5f97b2d5
parent506d913e0af6923f2b5e56127ac4954da7fea21b (diff)
parentde90849ccf3089dd00fc1565d6d3caa19291346f (diff)
Merge branch 'master' into lb_2.0.1
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-virt-notify-user2
-rw-r--r--config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-virt-notify-user.po13
-rw-r--r--config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-virt-notify-user.po4
-rw-r--r--config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot2
-rw-r--r--config/chroot_local-includes/usr/share/tails-security-check/messages.pot2
-rw-r--r--config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot4
-rw-r--r--debian/changelog18
-rw-r--r--wiki/src/support.ca.po10
-rw-r--r--wiki/src/support.de.po10
-rw-r--r--wiki/src/support.es.po10
-rw-r--r--wiki/src/support.fr.po14
-rw-r--r--wiki/src/support.html5
-rw-r--r--wiki/src/support/virtualisation.mdwn21
-rw-r--r--wiki/src/support/virtualization.ca.po (renamed from wiki/src/support/virtualisation.ca.po)27
-rw-r--r--wiki/src/support/virtualization.de.po (renamed from wiki/src/support/virtualisation.de.po)27
-rw-r--r--wiki/src/support/virtualization.es.po (renamed from wiki/src/support/virtualisation.es.po)27
-rw-r--r--wiki/src/support/virtualization.fr.po (renamed from wiki/src/support/virtualisation.fr.po)33
-rw-r--r--wiki/src/support/virtualization.mdwn21
24 files changed, 147 insertions, 127 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
index 1b97855..7af8c04 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
@@ -53,7 +53,7 @@ my $notify = Desktop::Notify->new();
my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in T(A)ILS.") . "\n"
- . gettext("Please read the <a href='file:///live/image/doc/amnesia/wiki/support/virtualisation.en.html'>documentation page</a> for more information.");
+ . gettext("Please read the <a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en.html'>documentation page</a> for more information.");
$notify->create(summary => $summary,
body => $body,
diff --git a/config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-virt-notify-user.po
index afd8256..2cf816d 100644
--- a/config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-virt-notify-user.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
-"PO-Revision-Date: 2010-09-25 15:26+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\n"
+"PO-Revision-Date: 2010-10-02 22:54+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -25,14 +25,17 @@ msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in T(A)ILS."
msgstr ""
-"Le système d'exploitation \"hôte\" et le logiciel de virtualisation sont en "
-"mesure de surveiller ce que vous faites dans T(A)ILS."
+"Le système d'exploitation \"hôte\" et le logiciel de virtualisation peuvent "
+"surveiller ce que vous faites dans T(A)ILS."
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
+"Lisez la <a\n"
+"href='file:///live/image/doc/amnesia/wiki/support/virtualization.fr.html'>documentation</a>\n"
+"pour plus d'information."
#~ msgid ""
#~ "If you are not aware to be using a virtual machine: there could be a <a "
diff --git a/config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-virt-notify-user.po b/config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-virt-notify-user.po
index 4fd026a..049915c 100644
--- a/config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-virt-notify-user.po
+++ b/config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-virt-notify-user.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot b/config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot
index e8f958b..4f5b277 100644
--- a/config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot
+++ b/config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
diff --git a/config/chroot_local-includes/usr/share/tails-security-check/messages.pot b/config/chroot_local-includes/usr/share/tails-security-check/messages.pot
index 29d4fb3..d7cc609 100644
--- a/config/chroot_local-includes/usr/share/tails-security-check/messages.pot
+++ b/config/chroot_local-includes/usr/share/tails-security-check/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
diff --git a/config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot b/config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot
index a41bed5..a4f1235 100644
--- a/config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot
+++ b/config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-02 17:25+0200\n"
+"POT-Creation-Date: 2010-10-02 22:54+0200\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"
@@ -30,5 +30,5 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:56
msgid ""
"Please read the <a href='file:///live/image/doc/amnesia/wiki/support/"
-"virtualisation.en.html'>documentation page</a> for more information."
+"virtualization.en.html'>documentation page</a> for more information."
msgstr ""
diff --git a/debian/changelog b/debian/changelog
index b91cca2..cdab71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+tails (0.6~rc3) UNRELEASED; urgency=low
+
+ ** SNAPSHOT build @fa1e12af00a6ad90eec804cd585401c533d6f92e **
+
+ * HTP
+ - Upgrade htpdate script (taken from Git 7797fe9).
+
+ * Misc
+ - Disable ssh-agent auto-starting with X session: gnome-keyring is
+ more user-friendly.
+ - Fix virtualization warning display.
+
+ * Build system
+ - Remove hand-made rcS.d/S41tails-wifi: a hook now does this.
+ - Measure time used by the lh build command.
+
+ -- T(A)ILS developers <amnesia@boum.org> Sat, 02 Oct 2010 23:06:46 +0200
+
tails (0.6~rc2) UNRELEASED; urgency=low
** SNAPSHOT build @c0ca0760ff577a1e797cdddf0e95c5d62a986ec8 **
diff --git a/wiki/src/support.ca.po b/wiki/src/support.ca.po
index bc04fe6..c24078b 100644
--- a/wiki/src/support.ca.po
+++ b/wiki/src/support.ca.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-22 17:08-0600\n"
+"POT-Creation-Date: 2010-10-02 14:04-0600\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"
@@ -30,8 +30,12 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "[[Read on!|walkthrough]]"
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Walkthrough]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><h1>
diff --git a/wiki/src/support.de.po b/wiki/src/support.de.po
index bc04fe6..c24078b 100644
--- a/wiki/src/support.de.po
+++ b/wiki/src/support.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-22 17:08-0600\n"
+"POT-Creation-Date: 2010-10-02 14:04-0600\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"
@@ -30,8 +30,12 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "[[Read on!|walkthrough]]"
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Walkthrough]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><h1>
diff --git a/wiki/src/support.es.po b/wiki/src/support.es.po
index bc04fe6..c24078b 100644
--- a/wiki/src/support.es.po
+++ b/wiki/src/support.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-22 17:08-0600\n"
+"POT-Creation-Date: 2010-10-02 14:04-0600\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"
@@ -30,8 +30,12 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "[[Read on!|walkthrough]]"
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Walkthrough]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><h1>
diff --git a/wiki/src/support.fr.po b/wiki/src/support.fr.po
index 9eb73c1..801cff3 100644
--- a/wiki/src/support.fr.po
+++ b/wiki/src/support.fr.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-22 17:08-0600\n"
-"PO-Revision-Date: 2010-07-11 21:19+0200\n"
+"POT-Creation-Date: 2010-10-02 14:04-0600\n"
+"PO-Revision-Date: 2010-10-02 23:05+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -30,9 +30,13 @@ msgstr ""
msgid "Documentation"
msgstr "Documentation"
-#. type: Content of: <div><div><div>
-msgid "[[Read on!|walkthrough]]"
-msgstr "[[C'est par là !|walkthrough]]"
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Walkthrough]]"
+msgstr "[[Tour d'horizon|walkthrough]]"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "[[Virtualization]]"
+msgstr "[[Virtualisation|Virtualization]]"
#. type: Content of: <div><div><div><h1>
msgid "Found a problem?"
diff --git a/wiki/src/support.html b/wiki/src/support.html
index 69f0559..8780cec 100644
--- a/wiki/src/support.html
+++ b/wiki/src/support.html
@@ -17,7 +17,10 @@ being complete yet.
<h1>Documentation</h1>
-[[Read on!|walkthrough]]
+<ul>
+<li>[[Walkthrough]]</li>
+<li>[[Virtualization]]</li>
+</ul>
</div> <!-- #doc -->
diff --git a/wiki/src/support/virtualisation.mdwn b/wiki/src/support/virtualisation.mdwn
deleted file mode 100644
index a34a2c8..0000000
--- a/wiki/src/support/virtualisation.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!meta title="Virtualisation"]]
-
-[[!toc levels=2]]
-
-FIXME: shouldn't the paragraph "T(A)ILS and Virtualization" from [[walkthrough]]
-come here?
-
-Security issues
-===============
-
-When running T(A)ILS inside a vritual machine, both the host operating system
-and the virtualization software are able to monitor what you are doing in
-T(A)ILS. Moreover traces are likely to be left in the host computer.
-
-That's why T(A)ILS tries to warn you when you are running it inside a virtual
-machine.
-
-If you get this warning while you are not aware to be using a virtual machine:
-there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> in
-the virtualization detection software T(A)ILS uses... or something really weird
-is happening.
diff --git a/wiki/src/support/virtualisation.ca.po b/wiki/src/support/virtualization.ca.po
index 64d450c..a6a1989 100644
--- a/wiki/src/support/virtualisation.ca.po
+++ b/wiki/src/support/virtualization.ca.po
@@ -7,18 +7,18 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-02 08:25-0600\n"
+"POT-Creation-Date: 2010-10-02 13:59-0600\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"
+"Language: \n"
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Virtualisation\"]]\n"
+msgid "[[!meta title=\"Virtualization\"]]\n"
msgstr ""
#. type: Plain text
@@ -39,26 +39,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"When running T(A)ILS inside a vritual machine, both the host operating "
+"When running T(A)ILS inside a virtual machine, both the host operating "
"system and the virtualization software are able to monitor what you are "
-"doing in T(A)ILS. Moreover traces are likely to be left in the host "
-"computer."
+"doing in T(A)ILS. Moreover traces are likely to be left on the local hard "
+"disk."
msgstr ""
#. type: Plain text
msgid ""
-"That's why T(A)ILS tries to warn you when you are running it inside a "
-"virtual machine."
+"That's why T(A)ILS warns you when you are running it inside a virtual "
+"machine."
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"If you get this warning while you are not aware to be using a virtual "
-"machine:\n"
-"there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> "
-"in\n"
-"the virtualization detection software T(A)ILS uses... or something really "
-"weird\n"
-"is happening.\n"
+"If you read this warning while you are not aware to be using a virtual "
+"machine: there could be a [[bug|found_a_problem]] in the virtualization "
+"detection software T(A)ILS uses... or something really weird is happening."
msgstr ""
diff --git a/wiki/src/support/virtualisation.de.po b/wiki/src/support/virtualization.de.po
index 64d450c..a6a1989 100644
--- a/wiki/src/support/virtualisation.de.po
+++ b/wiki/src/support/virtualization.de.po
@@ -7,18 +7,18 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-02 08:25-0600\n"
+"POT-Creation-Date: 2010-10-02 13:59-0600\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"
+"Language: \n"
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Virtualisation\"]]\n"
+msgid "[[!meta title=\"Virtualization\"]]\n"
msgstr ""
#. type: Plain text
@@ -39,26 +39,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"When running T(A)ILS inside a vritual machine, both the host operating "
+"When running T(A)ILS inside a virtual machine, both the host operating "
"system and the virtualization software are able to monitor what you are "
-"doing in T(A)ILS. Moreover traces are likely to be left in the host "
-"computer."
+"doing in T(A)ILS. Moreover traces are likely to be left on the local hard "
+"disk."
msgstr ""
#. type: Plain text
msgid ""
-"That's why T(A)ILS tries to warn you when you are running it inside a "
-"virtual machine."
+"That's why T(A)ILS warns you when you are running it inside a virtual "
+"machine."
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"If you get this warning while you are not aware to be using a virtual "
-"machine:\n"
-"there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> "
-"in\n"
-"the virtualization detection software T(A)ILS uses... or something really "
-"weird\n"
-"is happening.\n"
+"If you read this warning while you are not aware to be using a virtual "
+"machine: there could be a [[bug|found_a_problem]] in the virtualization "
+"detection software T(A)ILS uses... or something really weird is happening."
msgstr ""
diff --git a/wiki/src/support/virtualisation.es.po b/wiki/src/support/virtualization.es.po
index 64d450c..a6a1989 100644
--- a/wiki/src/support/virtualisation.es.po
+++ b/wiki/src/support/virtualization.es.po
@@ -7,18 +7,18 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-02 08:25-0600\n"
+"POT-Creation-Date: 2010-10-02 13:59-0600\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"
+"Language: \n"
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Virtualisation\"]]\n"
+msgid "[[!meta title=\"Virtualization\"]]\n"
msgstr ""
#. type: Plain text
@@ -39,26 +39,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"When running T(A)ILS inside a vritual machine, both the host operating "
+"When running T(A)ILS inside a virtual machine, both the host operating "
"system and the virtualization software are able to monitor what you are "
-"doing in T(A)ILS. Moreover traces are likely to be left in the host "
-"computer."
+"doing in T(A)ILS. Moreover traces are likely to be left on the local hard "
+"disk."
msgstr ""
#. type: Plain text
msgid ""
-"That's why T(A)ILS tries to warn you when you are running it inside a "
-"virtual machine."
+"That's why T(A)ILS warns you when you are running it inside a virtual "
+"machine."
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"If you get this warning while you are not aware to be using a virtual "
-"machine:\n"
-"there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> "
-"in\n"
-"the virtualization detection software T(A)ILS uses... or something really "
-"weird\n"
-"is happening.\n"
+"If you read this warning while you are not aware to be using a virtual "
+"machine: there could be a [[bug|found_a_problem]] in the virtualization "
+"detection software T(A)ILS uses... or something really weird is happening."
msgstr ""
diff --git a/wiki/src/support/virtualisation.fr.po b/wiki/src/support/virtualization.fr.po
index 64d450c..ba910b1 100644
--- a/wiki/src/support/virtualisation.fr.po
+++ b/wiki/src/support/virtualization.fr.po
@@ -7,19 +7,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-02 08:25-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2010-10-02 13:59-0600\n"
+"PO-Revision-Date: 2010-10-02 23:01+0200\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"
+"Language: \n"
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Virtualisation\"]]\n"
-msgstr ""
+msgid "[[!meta title=\"Virtualization\"]]\n"
+msgstr "[[!meta title=\"Virtualisation\"]]\n"
#. type: Plain text
#, no-wrap
@@ -35,30 +35,25 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Security issues\n"
-msgstr ""
+msgstr "Problèmes de sécurité\n"
#. type: Plain text
msgid ""
-"When running T(A)ILS inside a vritual machine, both the host operating "
+"When running T(A)ILS inside a virtual machine, both the host operating "
"system and the virtualization software are able to monitor what you are "
-"doing in T(A)ILS. Moreover traces are likely to be left in the host "
-"computer."
+"doing in T(A)ILS. Moreover traces are likely to be left on the local hard "
+"disk."
msgstr ""
#. type: Plain text
msgid ""
-"That's why T(A)ILS tries to warn you when you are running it inside a "
-"virtual machine."
+"That's why T(A)ILS warns you when you are running it inside a virtual "
+"machine."
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"If you get this warning while you are not aware to be using a virtual "
-"machine:\n"
-"there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> "
-"in\n"
-"the virtualization detection software T(A)ILS uses... or something really "
-"weird\n"
-"is happening.\n"
+"If you read this warning while you are not aware to be using a virtual "
+"machine: there could be a [[bug|found_a_problem]] in the virtualization "
+"detection software T(A)ILS uses... or something really weird is happening."
msgstr ""
diff --git a/wiki/src/support/virtualization.mdwn b/wiki/src/support/virtualization.mdwn
new file mode 100644
index 0000000..1080d82
--- /dev/null
+++ b/wiki/src/support/virtualization.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="Virtualization"]]
+
+[[!toc levels=2]]
+
+FIXME: shouldn't the paragraph "T(A)ILS and Virtualization" from [[walkthrough]]
+come here?
+
+Security issues
+===============
+
+When running T(A)ILS inside a virtual machine, both the host operating system
+and the virtualization software are able to monitor what you are doing in
+T(A)ILS. Moreover traces are likely to be left on the local hard disk.
+
+That's why T(A)ILS warns you when you are running it inside a virtual
+machine.
+
+If you read this warning while you are not aware to be using a virtual
+machine: there could be a [[bug|found_a_problem]] in the
+virtualization detection software T(A)ILS uses... or something really
+weird is happening.