summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-08-05 15:55:00 +0200
committerTails developers <amnesia@boum.org>2012-08-05 15:55:00 +0200
commit5a9c39a61cc32b8d6f008407869e03a9a971b5c9 (patch)
treeb274b026290aeb650310283e174275e93f22e283 /wiki/src
parentb1e1be3f84d097777948c3e3e4f97e887b782bc4 (diff)
Revert "Merge branch 'master' into doc/trail"
This reverts commit 848dd103cbdc6324e1ec0f85e1c7ef26f4b95630, reversing changes made to 932a867d908c72c6070f962cb30514d85a28bd17.
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/.htaccess1
-rw-r--r--wiki/src/contribute/design/persistence.mdwn2
-rw-r--r--wiki/src/contribute/design/usb_installation.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
-rw-r--r--wiki/src/doc.de.po51
-rw-r--r--wiki/src/doc.es.po48
-rw-r--r--wiki/src/doc.fr.po54
-rw-r--r--wiki/src/doc.mdwn11
-rw-r--r--wiki/src/doc.pt.po76
-rw-r--r--wiki/src/doc/about.de.po27
-rw-r--r--wiki/src/doc/about.es.po27
-rw-r--r--wiki/src/doc/about.fr.po27
-rw-r--r--wiki/src/doc/about.index.de.po40
-rw-r--r--wiki/src/doc/about.index.es.po40
-rw-r--r--wiki/src/doc/about.index.fr.po40
-rw-r--r--wiki/src/doc/about.index.mdwn6
-rw-r--r--wiki/src/doc/about.index.pt.po41
-rw-r--r--wiki/src/doc/about.mdwn3
-rw-r--r--wiki/src/doc/about.pt.po27
-rw-r--r--wiki/src/doc/advanced_topics.de.po2
-rw-r--r--wiki/src/doc/advanced_topics.es.po2
-rw-r--r--wiki/src/doc/advanced_topics.fr.po4
-rw-r--r--wiki/src/doc/advanced_topics.index.de.po10
-rw-r--r--wiki/src/doc/advanced_topics.index.es.po10
-rw-r--r--wiki/src/doc/advanced_topics.index.fr.po18
-rw-r--r--wiki/src/doc/advanced_topics.index.mdwn6
-rw-r--r--wiki/src/doc/advanced_topics.index.pt.po17
-rw-r--r--wiki/src/doc/advanced_topics.pt.po2
-rw-r--r--wiki/src/doc/anonymous_internet.de.po2
-rw-r--r--wiki/src/doc/anonymous_internet.es.po2
-rw-r--r--wiki/src/doc/anonymous_internet.fr.po2
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po16
-rw-r--r--wiki/src/doc/anonymous_internet.index.es.po16
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po27
-rw-r--r--wiki/src/doc/anonymous_internet.index.mdwn10
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po26
-rw-r--r--wiki/src/doc/anonymous_internet.pt.po2
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.pt.po6
-rw-r--r--wiki/src/doc/encryption_and_privacy.de.po3
-rw-r--r--wiki/src/doc/encryption_and_privacy.es.po3
-rw-r--r--wiki/src/doc/encryption_and_privacy.fr.po11
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.de.po22
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.es.po22
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.fr.po44
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.mdwn14
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.pt.po37
-rw-r--r--wiki/src/doc/encryption_and_privacy.pt.po3
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po (renamed from wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po)2
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po (renamed from wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po)2
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po (renamed from wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po)2
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn (renamed from wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn)2
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.pt.po (renamed from wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po)2
-rw-r--r--wiki/src/doc/first_steps.de.po3
-rw-r--r--wiki/src/doc/first_steps.es.po3
-rw-r--r--wiki/src/doc/first_steps.fr.po3
-rw-r--r--wiki/src/doc/first_steps.index.de.po46
-rw-r--r--wiki/src/doc/first_steps.index.es.po46
-rw-r--r--wiki/src/doc/first_steps.index.fr.po90
-rw-r--r--wiki/src/doc/first_steps.index.mdwn44
-rw-r--r--wiki/src/doc/first_steps.index.pt.po46
-rw-r--r--wiki/src/doc/first_steps.pt.po3
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po2
-rw-r--r--wiki/src/doc/sensitive_documents.de.po2
-rw-r--r--wiki/src/doc/sensitive_documents.es.po2
-rw-r--r--wiki/src/doc/sensitive_documents.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents.index.de.po16
-rw-r--r--wiki/src/doc/sensitive_documents.index.es.po16
-rw-r--r--wiki/src/doc/sensitive_documents.index.fr.po28
-rw-r--r--wiki/src/doc/sensitive_documents.index.mdwn10
-rw-r--r--wiki/src/doc/sensitive_documents.index.pt.po26
-rw-r--r--wiki/src/doc/sensitive_documents.pt.po3
-rw-r--r--wiki/src/doc/walkthrough.fr.po2
-rw-r--r--wiki/src/local.css42
-rw-r--r--wiki/src/templates/page.tmpl2
-rw-r--r--wiki/src/todo/better_internal_disks_lock.mdwn2
-rw-r--r--wiki/src/todo/documentation_translation.mdwn2
-rw-r--r--wiki/src/todo/get_rid_of_the_restart_Tor_launcher.mdwn2
77 files changed, 506 insertions, 812 deletions
diff --git a/wiki/src/.htaccess b/wiki/src/.htaccess
index 477a9c5..e3ccb45 100644
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -24,4 +24,3 @@ RewriteRule ^doc/first_steps/bridge_mode doc/first_steps/startup_options/bridge_
RewriteRule ^doc/first_steps/windows_theme doc/first_steps/startup_options/windows_camouflage [R]
RewriteRule ^doc/trusting_tails_signing_key doc/get/trusting_tails_signing_key [R]
RewriteRule ^doc/first_steps/report_a_bug doc/first_steps/bug_reporting [R]
-RewriteRule ^doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked [R]
diff --git a/wiki/src/contribute/design/persistence.mdwn b/wiki/src/contribute/design/persistence.mdwn
index b75447a..c0a42db 100644
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
@@ -1,5 +1,5 @@
Data persistence is a somewhat tricky topic in a Live system context,
-especially one explicitly designed to avoid leaving any trace of
+especially one explicitely designed to avoid leaving any trace of
its use.
Some real-life usecases however require to setup some kind of data
diff --git a/wiki/src/contribute/design/usb_installation.mdwn b/wiki/src/contribute/design/usb_installation.mdwn
index 2648bee..cca14fc 100644
--- a/wiki/src/contribute/design/usb_installation.mdwn
+++ b/wiki/src/contribute/design/usb_installation.mdwn
@@ -49,7 +49,7 @@ The storage device is partitioned using [GPT](https://en.wikipedia.org/wiki/GUID
* The system partition can be hidden from Windows. Hopefully this
should prevent some misuse of Tails system partition, even if we
- explicitly discourage users to plug their Tails USB stick to a
+ explicitely discourage users to plug their Tails USB stick to a
running system (Windows among other OS).
* `sgdisk` can run on Windows whereas no other free partitioning tools
are available under Windows for other partioning method.
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 627fde2..5e37cde 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -70,7 +70,7 @@ Check the image size has not changed much since the last release.
- check output of `iptables -t nat -L -n -v`
- try connecting to the Internet after unsetting `$http_proxy` and
`$HTTP_PROXY` using a piece of software that does not obey the
- GNOME proxy settings, *and* is not explicitly torified in Tails:
+ GNOME proxy settings, *and* is not explicitely torified in Tails:
`unset http_proxy ; unset HTTP_PROXY ; wget --no-proxy
http://monip.org` (should result in a "`Connection refused`".
* firewall: is IPv6 traffic blocked?
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index dcade6f..6669046 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 18:30+0300\n"
+"POT-Creation-Date: 2012-05-22 16:26+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,13 +38,34 @@ msgstr ""
#. type: Title #
#, no-wrap
-msgid "[[General information|about]]"
+msgid "General information"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.de\" raw=\"yes\"]]\n"
+#. type: Bullet: ' - '
+msgid "[[Why do you need anonymity?|about/anonymity]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[System requirements|about/requirements]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Warning|doc/about/warning]]"
+msgid "[[Warnings!|about/warning]]"
+msgstr "[[Warnungen|doc/about/warning]]"
+
+#. type: Bullet: ' - '
+msgid "[[Features|about/features]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Trusting Tails|about/trust]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[License|about/license]]"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -53,7 +75,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/get.index.de\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -63,7 +85,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.de\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -73,7 +95,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.de\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -83,7 +105,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.de\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -93,7 +115,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/sensitive_documents.index.de\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -103,11 +125,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\"]]\n"
-
-#~| msgid "[[Warning|doc/about/warning]]"
-#~ msgid "[[Warnings!|about/warning]]"
-#~ msgstr "[[Warnungen|doc/about/warning]]"
+msgstr ""
#~ msgid "[[First time user?|download#index1h1]]"
#~ msgstr "[[Neuer Benutzer?|download#index1h1]]"
@@ -115,6 +133,7 @@ msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\"]]\n"
#~ msgid "[[Download the ISO image|download#index2h1]]"
#~ msgstr "[[Download des ISO-Images|download#index2h1]] (CD-Abbild)"
+#, fuzzy
#~| msgid ""
#~| "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
#~| " - [[Installing onto a USB stick, for Linux|first_steps/"
diff --git a/wiki/src/doc.es.po b/wiki/src/doc.es.po
index fe6001a..a59694f 100644
--- a/wiki/src/doc.es.po
+++ b/wiki/src/doc.es.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 18:30+0300\n"
+"POT-Creation-Date: 2012-05-22 16:26+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: MIG PONCE <mig.p6165@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,13 +37,33 @@ msgid "- [[Introduction to this documentation|introduction]]"
msgstr "- [[Introducción a esta documentación|introduction]]"
#. type: Title #
-msgid "[[General information|about]]"
-msgstr "[[Información general|about]]"
-
-#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.es\" raw=\"yes\"]]\n"
+msgid "General information"
+msgstr "Información general"
+
+#. type: Bullet: ' - '
+msgid "[[Why do you need anonymity?|about/anonymity]]"
+msgstr "[[Porque necesitar anonimato?|about/anonymity]] "
+
+#. type: Bullet: ' - '
+msgid "[[System requirements|about/requirements]]"
+msgstr "[[Requisitos de sistema|about/requirements]]"
+
+#. type: Bullet: ' - '
+msgid "[[Warnings!|about/warning]]"
+msgstr "[[Avisos!|about/warning]]"
+
+#. type: Bullet: ' - '
+msgid "[[Features|about/features]]"
+msgstr "[[Caracteristicas|about/features]]"
+
+#. type: Bullet: ' - '
+msgid "[[Trusting Tails|about/trust]]"
+msgstr "[[Confiabilidad|about/trust]]"
+
+#. type: Bullet: ' - '
+msgid "[[Licence|about/licence]]"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -50,8 +71,10 @@ msgid "[[Get Tails|download]]"
msgstr "[[Descarga Tails|download]]"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/get.index.es\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/sensitive_documents.index.es\" raw=\"yes\"]]\n"
#. type: Title #
#, no-wrap
@@ -61,7 +84,7 @@ msgstr "[[Primeros pasos con Tails|first_steps]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.es\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -71,7 +94,7 @@ msgstr "[[Conectarse a Internet anónimamente|anonymous_internet]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.es\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -81,7 +104,7 @@ msgstr "[[Encriptación y privacidad|encryption_and_privacy]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.es\" raw=\"yes\"]]\n"
+msgstr ""
#. type: Title #
#, no-wrap
@@ -101,7 +124,7 @@ msgstr "[[Temas avanzados|advanced_topics]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\"]]\n"
+msgstr ""
#~ msgid ""
#~ "- [[Why do you need anonymity?|about/anonymity]] - [[System requirements|"
@@ -132,6 +155,7 @@ msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\"]]\n"
#~ msgid "[[Download the ISO image|download#index2h1]]"
#~ msgstr "[[Descargar la imagen ISO|download#index2h1]]"
+#, fuzzy
#~| msgid ""
#~| "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
#~| " - [[Installing onto a USB stick, for Linux|first_steps/"
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 276c5e9..6302433 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 18:30+0300\n"
+"POT-Creation-Date: 2012-05-22 16:26+0300\n"
"PO-Revision-Date: 2012-06-05 15:57+0100\n"
"Last-Translator: MR\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -36,13 +36,33 @@ msgid "- [[Introduction to this documentation|introduction]]"
msgstr "- [[Introduction sur cette documentation|introduction]]"
#. type: Title #
-msgid "[[General information|about]]"
-msgstr "[[Informations générales|about]]"
-
-#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.fr\" raw=\"yes\"]]\n"
+msgid "General information"
+msgstr "Informations générales"
+
+#. type: Bullet: ' - '
+msgid "[[Why do you need anonymity?|about/anonymity]]"
+msgstr "[[Pourquoi avons-nous besoin d'anonymat?|about/anonymity]]"
+
+#. type: Bullet: ' - '
+msgid "[[System requirements|about/requirements]]"
+msgstr "[[Configuration requise|about/requirements]]"
+
+#. type: Bullet: ' - '
+msgid "[[Warnings!|about/warning]]"
+msgstr "[[Avertissements!|about/warning]]"
+
+#. type: Bullet: ' - '
+msgid "[[Features|about/features]]"
+msgstr "[[Fonctionnalités|about/features]]"
+
+#. type: Bullet: ' - '
+msgid "[[Trusting Tails|about/trust]]"
+msgstr "[[Avoir confiance en Tails|about/trust]]"
+
+#. type: Bullet: ' - '
+msgid "[[License|about/license]]"
+msgstr "[[License|about/license]]"
#. type: Title #
#, no-wrap
@@ -97,31 +117,13 @@ msgstr "[[!inline pages=\"doc/sensitive_documents.index.fr\" raw=\"yes\"]]\n"
#. type: Title #
#, no-wrap
msgid "[[Advanced topics|advanced_topics]]"
-msgstr "[[Sujets avancés|advanced_topics]]"
+msgstr "[[Discussions avancés|advanced_topics]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.fr\" raw=\"yes\"]]\n"
-#~ msgid "[[Why do you need anonymity?|about/anonymity]]"
-#~ msgstr "[[Pourquoi avons-nous besoin d'anonymat?|about/anonymity]]"
-
-#~ msgid "[[System requirements|about/requirements]]"
-#~ msgstr "[[Configuration requise|about/requirements]]"
-
-#~ msgid "[[Warnings!|about/warning]]"
-#~ msgstr "[[Avertissements!|about/warning]]"
-
-#~ msgid "[[Features|about/features]]"
-#~ msgstr "[[Fonctionnalités|about/features]]"
-
-#~ msgid "[[Trusting Tails|about/trust]]"
-#~ msgstr "[[Avoir confiance en Tails|about/trust]]"
-
-#~ msgid "[[License|about/license]]"
-#~ msgstr "[[License|about/license]]"
-
#~ msgid ""
#~ "- [[Why do you need anonymity?|about/anonymity]] - [[System requirements|"
#~ "about/requirements]] - [[Warnings!|about/warning]] - [[Features|about/"
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index a016aea..9367f23 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -6,9 +6,14 @@ to write it yourself and share it with us.
- [[Introduction to this documentation|introduction]]
-# [[General information|about]]
-
-[[!inline pages="doc/about.index" raw="yes"]]
+# General information
+
+ - [[Why do you need anonymity?|about/anonymity]]
+ - [[System requirements|about/requirements]]
+ - [[Warnings!|about/warning]]
+ - [[Features|about/features]]
+ - [[Trusting Tails|about/trust]]
+ - [[License|about/license]]
# [[Get Tails|download]]
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 7c24511..f23e212 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -32,13 +32,33 @@ msgid "- [[Introduction to this documentation|introduction]]"
msgstr "- [[Introdução a esta documentação|introduction]]"
#. type: Title #
-msgid "[[General information|about]]"
-msgstr "[[Informações gerais|about]]"
-
-#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.pt\" raw=\"yes\"]]\n"
+msgid "General information"
+msgstr "Informações gerais"
+
+#. type: Bullet: ' - '
+msgid "[[Why do you need anonymity?|about/anonymity]]"
+msgstr "[[Por que você precisa de anonimidade?|about/anonymity]]"
+
+#. type: Bullet: ' - '
+msgid "[[System requirements|about/requirements]]"
+msgstr "[[Requerimentos de sistema|about/requirements]]"
+
+#. type: Bullet: ' - '
+msgid "[[Warnings!|about/warning]]"
+msgstr "[[Advertência!|about/warning]]"
+
+#. type: Bullet: ' - '
+msgid "[[Features|about/features]]"
+msgstr "[[Características|about/features]]"
+
+#. type: Bullet: ' - '
+msgid "[[Trusting Tails|about/trust]]"
+msgstr "[[Confiando no Tails|about/trust]]"
+
+#. type: Bullet: ' - '
+msgid "[[License|about/license]]"
+msgstr "[[Licença|about/license]]"
#. type: Title #
#, no-wrap
@@ -128,47 +148,3 @@ msgstr "[[!inline pages=\"doc/advanced_topics.index.pt\" raw=\"yes\"]]\n"
#~ msgid "[[Download the ISO image|download#index2h1]]"
#~ msgstr "[[Baixar a imagen ISO|download#index2h1]]"
-#~| msgid ""
-#~| "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
-#~| " - [[Installing onto a USB stick, for Linux|"
-#~| "installing_onto_a_usb_stick/linux]]\n"
-#~| " - [[Installing onto a USB stick, for Windows|"
-#~| "installing_onto_a_usb_stick/windows]]\n"
-#~| "- [[Stay tuned|download#index5h1]]\n"
-#~| "- [[Starting Tails!|download#index6h1]]\n"
-#~ msgid ""
-#~ "- [[Verify the ISO image|download#index3h1]]\n"
-#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
-#~ "verify_the_iso_image_using_gnome]]\n"
-#~ " - [[Using Linux with the command line|get/"
-#~ "verify_the_iso_image_using_the_command_line]]\n"
-#~ " - [[Using other operating systems|get/"
-#~ "verify_the_iso_image_using_other_operating_systems]]\n"
-#~ "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
-#~ " - [[Installing onto a USB stick, for Linux|installing_onto_a_usb_stick/"
-#~ "linux]]\n"
-#~ " - [[Installing onto a USB stick, for Windows|"
-#~ "installing_onto_a_usb_stick/windows]]\n"
-#~ " - [[Installing onto a USB stick, for Mac|installing_onto_a_usb_stick/"
-#~ "mac]]\n"
-#~ "- [[Stay tuned|download#index5h1]]\n"
-#~ "- [[Starting Tails!|download#index6h1]]\n"
-#~ msgstr ""
-#~ "- [[Verificar a imagem ISO|download#index3h1]]\n"
-#~ " - [[Usando Gnome: Ubuntu, Debian, Tails, etc.|get/"
-#~ "verify_the_iso_image_using_gnome]]\n"
-#~ " - [[Usando Linux via linha de comando|get/"
-#~ "verify_the_iso_image_using_the_command_line]]\n"
-#~ " - [[Usando outros sistemas operacionais|get/"
-#~ "verify_the_iso_image_using_other_operating_systems]]\n"
-#~ "- [[Gravar um CD instalar num stick USB|download#index4h1]]\n"
-#~ " - [[Instalando num USB stick, no Linux|installing_onto_a_usb_stick/"
-#~ "linux]]\n"
-#~ " - [[Instalando num USB stick, no Windows|installing_onto_a_usb_stick/"
-#~ "windows]]\n"
-#~ " - [[Instalando num USB stick, no Mac|installing_onto_a_usb_stick/mac]]\n"
-#~ "- [[Fique ligado/a|download#index5h1]]\n"
-#~ "- [[Iniciando o Tails!|download#index6h1]]\n"
-
-#~ msgid "[[Verify the ISO image|download#index3h1]]"
-#~ msgstr "[[Verificar la imagen ISO|download#index3h1]]"
diff --git a/wiki/src/doc/about.de.po b/wiki/src/doc/about.de.po
deleted file mode 100644
index b885813..0000000
--- a/wiki/src/doc/about.de.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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: 2012-07-22 18:24+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"General information\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.de\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/about.es.po b/wiki/src/doc/about.es.po
deleted file mode 100644
index 97de357..0000000
--- a/wiki/src/doc/about.es.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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: 2012-07-22 18:24+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"General information\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.es\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/about.fr.po b/wiki/src/doc/about.fr.po
deleted file mode 100644
index b2cd31b..0000000
--- a/wiki/src/doc/about.fr.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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: 2012-07-22 18:24+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"General information\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/about.index.de.po b/wiki/src/doc/about.index.de.po
deleted file mode 100644
index 7ee49b0..0000000
--- a/wiki/src/doc/about.index.de.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 15:38+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Why_do_you_need_anonymity?|about/anonymity]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink System_requirements|about/requirements]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Warnings!|about/warning]]"
-msgstr "[[!traillink Warnungen|about/warning]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Features|about/features]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Trusting_Tails|about/trust]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink License|about/license]]"
-msgstr ""
diff --git a/wiki/src/doc/about.index.es.po b/wiki/src/doc/about.index.es.po
deleted file mode 100644
index 8d003a4..0000000
--- a/wiki/src/doc/about.index.es.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 15:38+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Why_do_you_need_anonymity?|about/anonymity]]"
-msgstr "[[!traillink ¿Por_qué_la_necesidad_de_anonimato?|about/anonymity]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink System_requirements|about/requirements]]"
-msgstr "[[!traillink Requisitos_del_sistema|about/requirements]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Warnings!|about/warning]]"
-msgstr "[[!traillink Advertencia|about/warning]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Features|about/features]]"
-msgstr "[[!traillink Características|about/features]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Trusting_Tails|about/trust]]"
-msgstr "[[!traillink Confianza_en_Tails|about/trust]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink License|about/license]]"
-msgstr "[[!traillink Licencia|about/license]]"
diff --git a/wiki/src/doc/about.index.fr.po b/wiki/src/doc/about.index.fr.po
deleted file mode 100644
index 9fd52a2..0000000
--- a/wiki/src/doc/about.index.fr.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 15:38+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Why_do_you_need_anonymity?|about/anonymity]]"
-msgstr "[[!traillink Pourquoi_avons-nous_besoin_d'anonymat?|about/anonymity]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink System_requirements|about/requirements]]"
-msgstr "[[!traillink Configuration_requise|about/requirements]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Warnings!|about/warning]]"
-msgstr "[[!traillink Avertissements!|about/warning]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Features|about/features]]"
-msgstr "[[!traillink Fonctionnalités|about/features]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Trusting_Tails|about/trust]]"
-msgstr "[[!traillink Avoir_confiance_en_Tails|about/trust]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink License|about/license]]"
-msgstr "[[!traillink License|about/license]]"
diff --git a/wiki/src/doc/about.index.mdwn b/wiki/src/doc/about.index.mdwn
deleted file mode 100644
index a415707..0000000
--- a/wiki/src/doc/about.index.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
- - [[!traillink Why_do_you_need_anonymity?|about/anonymity]]
- - [[!traillink System_requirements|about/requirements]]
- - [[!traillink Warnings!|about/warning]]
- - [[!traillink Features|about/features]]
- - [[!traillink Trusting_Tails|about/trust]]
- - [[!traillink License|about/license]]
diff --git a/wiki/src/doc/about.index.pt.po b/wiki/src/doc/about.index.pt.po
deleted file mode 100644
index 55b0908..0000000
--- a/wiki/src/doc/about.index.pt.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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: 2012-07-22 15:38+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Why_do_you_need_anonymity?|about/anonymity]]"
-msgstr "[[!traillink Por_que_você_precisa_de_anonimidade?|about/anonymity]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink System_requirements|about/requirements]]"
-msgstr "[[!traillink Requerimentos_de_sistema|about/requirements]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Warnings!|about/warning]]"
-msgstr "[[!traillink Advertência!|about/warning]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Features|about/features]]"
-msgstr "[[!traillink Características|about/features]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Trusting_Tails|about/trust]]"
-msgstr "[[!traillink Confiando_no_Tails|about/trust]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink License|about/license]]"
-msgstr "[[!traillink Licença|about/license]]"
diff --git a/wiki/src/doc/about.mdwn b/wiki/src/doc/about.mdwn
deleted file mode 100644
index cb4e53b..0000000
--- a/wiki/src/doc/about.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="General information"]]
-
-[[!inline pages="doc/about.index" raw="yes"]]
diff --git a/wiki/src/doc/about.pt.po b/wiki/src/doc/about.pt.po
deleted file mode 100644
index 0565b8e..0000000
--- a/wiki/src/doc/about.pt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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: 2012-07-22 18:24+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"General information\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/about.index.pt\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/advanced_topics.de.po b/wiki/src/doc/advanced_topics.de.po
index ec41cad..18a3c36 100644
--- a/wiki/src/doc/advanced_topics.de.po
+++ b/wiki/src/doc/advanced_topics.de.po
@@ -24,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics.es.po b/wiki/src/doc/advanced_topics.es.po
index 511f48b..18a3c36 100644
--- a/wiki/src/doc/advanced_topics.es.po
+++ b/wiki/src/doc/advanced_topics.es.po
@@ -24,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics.fr.po b/wiki/src/doc/advanced_topics.fr.po
index b3b7869..a82f8cc 100644
--- a/wiki/src/doc/advanced_topics.fr.po
+++ b/wiki/src/doc/advanced_topics.fr.po
@@ -19,9 +19,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Advanced topics\"]]\n"
-msgstr "[[!meta title=\"Sujets avancés\"]]\n"
+msgstr "[[!meta title=\"Discussions avancées\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.fr\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics.index.de.po b/wiki/src/doc/advanced_topics.index.de.po
index aecca42..7b6da8b 100644
--- a/wiki/src/doc/advanced_topics.index.de.po
+++ b/wiki/src/doc/advanced_topics.index.de.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:42+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +18,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Protection_against_cold_boot_attacks|advanced_topics/"
-"cold_boot_attacks]]"
+"[[Protection against cold boot attacks|advanced_topics/cold_boot_attacks]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
+msgid "[[Virtualization|advanced_topics/virtualization]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
+msgid "[[Enable MAC Changer|advanced_topics/mac_changer]]"
msgstr ""
diff --git a/wiki/src/doc/advanced_topics.index.es.po b/wiki/src/doc/advanced_topics.index.es.po
index aecca42..7b6da8b 100644
--- a/wiki/src/doc/advanced_topics.index.es.po
+++ b/wiki/src/doc/advanced_topics.index.es.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:42+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +18,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Protection_against_cold_boot_attacks|advanced_topics/"
-"cold_boot_attacks]]"
+"[[Protection against cold boot attacks|advanced_topics/cold_boot_attacks]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
+msgid "[[Virtualization|advanced_topics/virtualization]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
+msgid "[[Enable MAC Changer|advanced_topics/mac_changer]]"
msgstr ""
diff --git a/wiki/src/doc/advanced_topics.index.fr.po b/wiki/src/doc/advanced_topics.index.fr.po
index e131976..7113612 100644
--- a/wiki/src/doc/advanced_topics.index.fr.po
+++ b/wiki/src/doc/advanced_topics.index.fr.po
@@ -3,10 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 16:42+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: 2012-05-17 21:37+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -17,16 +18,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Protection_against_cold_boot_attacks|advanced_topics/"
-"cold_boot_attacks]]"
-msgstr ""
-"[[!traillink Protection_contre_les_attaques_'cold_boot'|advanced_topics/"
-"cold_boot_attacks]]"
+"[[Protection against cold boot attacks|advanced_topics/cold_boot_attacks]]"
+msgstr "[[Protection contre les attaques 'cold boot'|advanced_topics/cold_boot_attacks]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
-msgstr "[[!traillink Virtualisation|advanced_topics/virtualization]]"
+msgid "[[Virtualization|advanced_topics/virtualization]]"
+msgstr "[[Virtualisation|advanced_topics/virtualization]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
-msgstr "[[!traillink Activer_MAC_Changer|advanced_topics/mac_changer]]"
+msgid "[[Enable MAC Changer|advanced_topics/mac_changer]]"
+msgstr "[[Activer MAC Changer |advanced_topics/mac_changer]]"
diff --git a/wiki/src/doc/advanced_topics.index.mdwn b/wiki/src/doc/advanced_topics.index.mdwn
index 4920b3c..b71ee1d 100644
--- a/wiki/src/doc/advanced_topics.index.mdwn
+++ b/wiki/src/doc/advanced_topics.index.mdwn
@@ -1,3 +1,3 @@
- - [[!traillink Protection_against_cold_boot_attacks|advanced_topics/cold_boot_attacks]]
- - [[!traillink Virtualization|advanced_topics/virtualization]]
- - [[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]
+ - [[Protection against cold boot attacks|advanced_topics/cold_boot_attacks]]
+ - [[Virtualization|advanced_topics/virtualization]]
+ - [[Enable MAC Changer|advanced_topics/mac_changer]]
diff --git a/wiki/src/doc/advanced_topics.index.pt.po b/wiki/src/doc/advanced_topics.index.pt.po
index ac2616c..6de009b 100644
--- a/wiki/src/doc/advanced_topics.index.pt.po
+++ b/wiki/src/doc/advanced_topics.index.pt.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:42+0300\n"
+"POT-Creation-Date: 2012-06-06 23:52+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Protection_against_cold_boot_attacks|advanced_topics/"
-"cold_boot_attacks]]"
-msgstr "[[!traillink Proteção_contra_ataques_*cold_boot*|advanced_topics/cold_boot_attacks]]"
+msgid "[[Protection against cold boot attacks|advanced_topics/cold_boot_attacks]]"
+msgstr "[[Proteção contra ataques *cold boot*|advanced_topics/cold_boot_attacks]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
-msgstr "[[!traillink Virtualização|advanced_topics/virtualization]]"
+msgid "[[Virtualization|advanced_topics/virtualization]]"
+msgstr "[[Virtualização|advanced_topics/virtualization]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
-msgstr "[[!traillink Habilitar_MAC_Changer|advanced_topics/mac_changer]]"
+msgid "[[Enable MAC Changer|advanced_topics/mac_changer]]"
+msgstr "[[Habilitar MAC Changer|advanced_topics/mac_changer]]"
diff --git a/wiki/src/doc/advanced_topics.pt.po b/wiki/src/doc/advanced_topics.pt.po
index 0c606ba..38f849c 100644
--- a/wiki/src/doc/advanced_topics.pt.po
+++ b/wiki/src/doc/advanced_topics.pt.po
@@ -24,4 +24,4 @@ msgstr "[[!meta title=\"Tópicos avançados\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/advanced_topics.index.pt\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.de.po b/wiki/src/doc/anonymous_internet.de.po
index 576b4b4..6ab04c5 100644
--- a/wiki/src/doc/anonymous_internet.de.po
+++ b/wiki/src/doc/anonymous_internet.de.po
@@ -24,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.de\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.es.po b/wiki/src/doc/anonymous_internet.es.po
index f01a043..6ab04c5 100644
--- a/wiki/src/doc/anonymous_internet.es.po
+++ b/wiki/src/doc/anonymous_internet.es.po
@@ -24,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.es\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.fr.po b/wiki/src/doc/anonymous_internet.fr.po
index 397ed5a..fdbdc0c 100644
--- a/wiki/src/doc/anonymous_internet.fr.po
+++ b/wiki/src/doc/anonymous_internet.fr.po
@@ -24,4 +24,4 @@ msgstr "[[!meta title=\"Se connecter à Internet de manière anonyme\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.fr\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index e4e01a1..98b824d 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:20+0300\n"
+"POT-Creation-Date: 2012-05-11 11:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Networking_with_NetworkManager|anonymous_internet/"
-"networkmanager]]"
+msgid "[[Networking with NetworkManager|anonymous_internet/networkmanager]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Controlling_Tor_with_Vidalia|anonymous_internet/vidalia]]"
+msgid "[[Controlling Tor with Vidalia|anonymous_internet/vidalia]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Iceweasel|anonymous_internet/iceweasel]]"
+msgid "[[Browsing the web with Iceweasel|anonymous_internet/iceweasel]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+msgid "[[Chatting with Pidgin & OTR|anonymous_internet/pidgin]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Using_I2P|anonymous_internet/i2p]]"
+msgid "[[Using I2P|anonymous_internet/i2p]]"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.es.po b/wiki/src/doc/anonymous_internet.index.es.po
index e4e01a1..98b824d 100644
--- a/wiki/src/doc/anonymous_internet.index.es.po
+++ b/wiki/src/doc/anonymous_internet.index.es.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:20+0300\n"
+"POT-Creation-Date: 2012-05-11 11:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Networking_with_NetworkManager|anonymous_internet/"
-"networkmanager]]"
+msgid "[[Networking with NetworkManager|anonymous_internet/networkmanager]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Controlling_Tor_with_Vidalia|anonymous_internet/vidalia]]"
+msgid "[[Controlling Tor with Vidalia|anonymous_internet/vidalia]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Iceweasel|anonymous_internet/iceweasel]]"
+msgid "[[Browsing the web with Iceweasel|anonymous_internet/iceweasel]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+msgid "[[Chatting with Pidgin & OTR|anonymous_internet/pidgin]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Using_I2P|anonymous_internet/i2p]]"
+msgid "[[Using I2P|anonymous_internet/i2p]]"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index e5a48b4..4313cfc 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -3,10 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 16:20+0300\n"
+"POT-Creation-Date: 2012-05-11 11:00+0300\n"
"PO-Revision-Date: 2012-05-17 21:37+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -16,25 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Networking_with_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-msgstr ""
-"[[!traillink Gestion_du_réseau_avec_NetworkManager|anonymous_internet/networkmanager]]"
+msgid "[[Networking with NetworkManager|anonymous_internet/networkmanager]]"
+msgstr "[[Gestion du réseau avec NetworkManager|anonymous_internet/networkmanager]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Controlling_Tor_with_Vidalia|anonymous_internet/vidalia]]"
-msgstr "[[!traillink Contrôler_Tor_avec_Vidalia|anonymous_internet/vidalia]]"
+msgid "[[Controlling Tor with Vidalia|anonymous_internet/vidalia]]"
+msgstr "[[Contrôler Tor avec Vidalia|anonymous_internet/vidalia]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Iceweasel|anonymous_internet/iceweasel]]"
-msgstr "[[!traillink Naviguer_sur_le_web_avec_Iceweasel|anonymous_internet/iceweasel]]"
+msgid "[[Browsing the web with Iceweasel|anonymous_internet/iceweasel]]"
+msgstr "[[Naviguer sur le web avec Iceweasel|anonymous_internet/iceweasel]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+msgid "[[Chatting with Pidgin & OTR|anonymous_internet/pidgin]]"
+msgstr "[[Discuter avec Pidgin & OTR|anonymous_internet/pidgin]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Using_I2P|anonymous_internet/i2p]]"
-msgstr "[[!traillink Utiliser_I2P|anonymous_internet/i2p]]"
+msgid "[[Using I2P|anonymous_internet/i2p]]"
+msgstr "[[Utiliser I2P|anonymous_internet/i2p]]"
diff --git a/wiki/src/doc/anonymous_internet.index.mdwn b/wiki/src/doc/anonymous_internet.index.mdwn
index 6ddc942..57db69f 100644
--- a/wiki/src/doc/anonymous_internet.index.mdwn
+++ b/wiki/src/doc/anonymous_internet.index.mdwn
@@ -1,5 +1,5 @@
- - [[!traillink Networking_with_NetworkManager|anonymous_internet/networkmanager]]
- - [[!traillink Controlling_Tor_with_Vidalia|anonymous_internet/vidalia]]
- - [[!traillink Browsing_the_web_with_Iceweasel|anonymous_internet/iceweasel]]
- - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]
- - [[!traillink Using_I2P|anonymous_internet/i2p]]
+ - [[Networking with NetworkManager|anonymous_internet/networkmanager]]
+ - [[Controlling Tor with Vidalia|anonymous_internet/vidalia]]
+ - [[Browsing the web with Iceweasel|anonymous_internet/iceweasel]]
+ - [[Chatting with Pidgin & OTR|anonymous_internet/pidgin]]
+ - [[Using I2P|anonymous_internet/i2p]]
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index aeeaf27..88d718d 100644
--- a/wiki/src/doc/anonymous_internet.index.pt.po
+++ b/wiki/src/doc/anonymous_internet.index.pt.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:20+0300\n"
+"POT-Creation-Date: 2012-06-06 23:06+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Networking_with_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-msgstr "[[!traillink Gerenciamento_de_rede_com_o_NetworkManager|anonymous_internet/networkmanager]]"
+msgid "[[Networking with NetworkManager|anonymous_internet/networkmanager]]"
+msgstr "[[Gerenciamento de rede com o NetworkManager|anonymous_internet/networkmanager]]]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Controlling_Tor_with_Vidalia|anonymous_internet/vidalia]]"
-msgstr "[[!traillink Controlando_Tor_com_Vidalia|anonymous_internet/vidalia]]"
+msgid "[[Controlling Tor with Vidalia|anonymous_internet/vidalia]]"
+msgstr "[[Controlando Tor com Vidalia|anonymous_internet/vidalia]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Iceweasel|anonymous_internet/iceweasel]]"
-msgstr "[[!traillink Navegando_na_internet_com_Iceweasel|anonymous_internet/iceweasel]]"
+msgid "[[Browsing the web with Iceweasel|anonymous_internet/iceweasel]]"
+msgstr "[[Navegando na internet com Iceweasel|anonymous_internet/iceweasel]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+msgid "[[Chatting with Pidgin & OTR|anonymous_internet/pidgin]]"
+msgstr "[[Batendo papo com Pidgin & OTR|anonymous_internet/pidgin]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Using_I2P|anonymous_internet/i2p]]"
-msgstr "[[!traillink Usando_I2P|anonymous_internet/i2p]]"
+msgid "[[Using I2P|anonymous_internet/i2p]]"
+msgstr "[[Usando I2P|anonymous_internet/i2p]]"
diff --git a/wiki/src/doc/anonymous_internet.pt.po b/wiki/src/doc/anonymous_internet.pt.po
index d4e6943..16b77a5 100644
--- a/wiki/src/doc/anonymous_internet.pt.po
+++ b/wiki/src/doc/anonymous_internet.pt.po
@@ -24,4 +24,4 @@ msgstr "[[!meta title=\"Conecte à Internet anonimamente\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet.index.pt\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/pidgin.pt.po b/wiki/src/doc/anonymous_internet/pidgin.pt.po
index dfc83b9..a4cf3a3 100644
--- a/wiki/src/doc/anonymous_internet/pidgin.pt.po
+++ b/wiki/src/doc/anonymous_internet/pidgin.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-21 00:15+0300\n"
+"POT-Creation-Date: 2012-06-28 10:58+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Lucas Vicente <alkaidw@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,6 +41,7 @@ msgstr ""
"Para uma documentação mais detalhada consulte o [guia oficial do Pidgin]"
"(http://developer.pidgin.im/wiki/Using%20Pidgin)."
+
#. type: Title ##
#, no-wrap
msgid "OTR encryption"
@@ -66,7 +67,8 @@ msgstr ""
"é escolher \"Iniciar conversa privada\" no menu OTR e uma chave será "
"gerada automaticamente se você ainda não a tem. Depois disto o OTR vai "
"estabelecer uma conversa privada se o outro mensageiro instantâneo terminal "
-"suportar isso."
+"suportar isso"
+
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/encryption_and_privacy.de.po b/wiki/src/doc/encryption_and_privacy.de.po
index 5220ad2..52cf16f 100644
--- a/wiki/src/doc/encryption_and_privacy.de.po
+++ b/wiki/src/doc/encryption_and_privacy.de.po
@@ -3,6 +3,7 @@
# 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"
@@ -47,4 +48,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.de\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy.es.po b/wiki/src/doc/encryption_and_privacy.es.po
index 949329f..52cf16f 100644
--- a/wiki/src/doc/encryption_and_privacy.es.po
+++ b/wiki/src/doc/encryption_and_privacy.es.po
@@ -3,6 +3,7 @@
# 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"
@@ -47,4 +48,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.es\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy.fr.po b/wiki/src/doc/encryption_and_privacy.fr.po
index ac336e4..189bffc 100644
--- a/wiki/src/doc/encryption_and_privacy.fr.po
+++ b/wiki/src/doc/encryption_and_privacy.fr.po
@@ -3,6 +3,7 @@
# 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"
@@ -47,4 +48,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.fr\" raw=\"yes\"]]\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "Tails includes [GNU Privacy Guard](http://www.gnupg.org/) (GnuPG) – A "
+#~ "Free implementation of OpenPGP used for encryption of all sorts."
+#~ msgstr ""
+#~ "[GNU Privacy Guard](http://www.gnupg.org/) (GnuPG) – Une application "
+#~ "libre de OpenPGP utilisée pour le cryptage de tout genre."
diff --git a/wiki/src/doc/encryption_and_privacy.index.de.po b/wiki/src/doc/encryption_and_privacy.index.de.po
index ce3e8c4..e6d785b 100644
--- a/wiki/src/doc/encryption_and_privacy.index.de.po
+++ b/wiki/src/doc/encryption_and_privacy.index.de.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:32+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +18,30 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Your_data_won't_be_saved_unless_explicitly_asked|"
-"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+"[[Your data won't be saved unless explicitely asked|encryption_and_privacy/"
+"your_data_wont_be_saved_unless_explicitely_asked]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Type_passwords_securely_on_an_untrusted_computer|"
-"encryption_and_privacy/virtual_keyboard]]"
+"[[Type passwords securely on an untrusted computer|encryption_and_privacy/"
+"virtual_keyboard]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Create_and_use_encrypted_volumes|encryption_and_privacy/"
-"encrypted_volumes]]"
+"[[Create and use encrypted volumes|encryption_and_privacy/encrypted_volumes]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]"
+msgid "[[TrueCrypt|encryption_and_privacy/truecrypt]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" - Use OpenPGP\n"
-" - [[!traillink Encrypt_text_with_a_passphrase_using_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Encrypt_and_sign_text_with_a_public_key_using_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Encrypt text with a passphrase using gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Encrypt and sign text with a public key using gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Securely delete files and clean diskspace using Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy.index.es.po b/wiki/src/doc/encryption_and_privacy.index.es.po
index ce3e8c4..e6d785b 100644
--- a/wiki/src/doc/encryption_and_privacy.index.es.po
+++ b/wiki/src/doc/encryption_and_privacy.index.es.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:32+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +18,30 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Your_data_won't_be_saved_unless_explicitly_asked|"
-"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+"[[Your data won't be saved unless explicitely asked|encryption_and_privacy/"
+"your_data_wont_be_saved_unless_explicitely_asked]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Type_passwords_securely_on_an_untrusted_computer|"
-"encryption_and_privacy/virtual_keyboard]]"
+"[[Type passwords securely on an untrusted computer|encryption_and_privacy/"
+"virtual_keyboard]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Create_and_use_encrypted_volumes|encryption_and_privacy/"
-"encrypted_volumes]]"
+"[[Create and use encrypted volumes|encryption_and_privacy/encrypted_volumes]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]"
+msgid "[[TrueCrypt|encryption_and_privacy/truecrypt]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" - Use OpenPGP\n"
-" - [[!traillink Encrypt_text_with_a_passphrase_using_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Encrypt_and_sign_text_with_a_public_key_using_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Encrypt text with a passphrase using gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Encrypt and sign text with a public key using gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Securely delete files and clean diskspace using Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy.index.fr.po b/wiki/src/doc/encryption_and_privacy.index.fr.po
index 0cf7f3a..0e20d8c 100644
--- a/wiki/src/doc/encryption_and_privacy.index.fr.po
+++ b/wiki/src/doc/encryption_and_privacy.index.fr.po
@@ -3,10 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 16:32+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: 2012-05-22 16:28+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -17,41 +18,34 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Your_data_won't_be_saved_unless_explicitly_asked|"
-"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
-msgstr ""
-"[[!traillink Vos_données_ne_seront_pas_sauvegardées_à_moins_que_vous_ne_le_demandiez_"
-"explicitement|encryption_and_privacy/"
-"your_data_wont_be_saved_unless_explicitly_asked]]"
+"[[Your data won't be saved unless explicitely asked|encryption_and_privacy/"
+"your_data_wont_be_saved_unless_explicitely_asked]]"
+msgstr "[[Vos données ne seront pas sauvegardées à moins que vous ne le demandiez explicitement|encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked]]"
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Type_passwords_securely_on_an_untrusted_computer|"
-"encryption_and_privacy/virtual_keyboard]]"
-msgstr ""
-"[[!traillink Taper_des_mots_de_passe_de_manière_sûre_sur_un_ordinateur_qui_ne_l'est_pas|"
-"encryption_and_privacy/virtual_keyboard]]"
+"[[Type passwords securely on an untrusted computer|encryption_and_privacy/"
+"virtual_keyboard]]"
+msgstr "[[Taper des mots de passe de manière sûre sur un ordinateur qui ne l'est pas|encryption_and_privacy/virtual_keyboard]]"
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Create_and_use_encrypted_volumes|encryption_and_privacy/"
-"encrypted_volumes]]"
-msgstr ""
-"[[!traillink Créer_et_utiliser_des_supports_chiffrés|encryption_and_privacy/"
-"encrypted_volumes]]"
+"[[Create and use encrypted volumes|encryption_and_privacy/encrypted_volumes]]"
+msgstr "[[Créer et utiliser des supports chiffrés|encryption_and_privacy/encrypted_volumes]]"
#. type: Bullet: ' - '
-msgid "[[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]"
-msgstr "[[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]"
+msgid "[[TrueCrypt|encryption_and_privacy/truecrypt]]"
+msgstr "[[TrueCrypt|encryption_and_privacy/truecrypt]]"
#. type: Plain text
+#, no-wrap
msgid ""
" - Use OpenPGP\n"
-" - [[!traillink Encrypt_text_with_a_passphrase_using_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Encrypt_and_sign_text_with_a_public_key_using_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Encrypt text with a passphrase using gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Encrypt and sign text with a public key using gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Securely delete files and clean diskspace using Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
msgstr ""
" - Utiliser OpenPGP\n"
-" - [[!traillink Chiffrer_du_texte_avec_une_phrase_secrète|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Chiffrer_et_signer_du_texte_avec_une_clé_publique_et_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Effacer_des_fichiers_de_façon_sécurisée_et_nettoyer_l'espace_disque_avec_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Chiffrer du texte avec une phrase secrète|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Chiffrer et signer du texte avec une clé publique et gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Effacer des fichiers de façon sécurisée et nettoyer l'espace disque avec Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
diff --git a/wiki/src/doc/encryption_and_privacy.index.mdwn b/wiki/src/doc/encryption_and_privacy.index.mdwn
index ab739ff..8171447 100644
--- a/wiki/src/doc/encryption_and_privacy.index.mdwn
+++ b/wiki/src/doc/encryption_and_privacy.index.mdwn
@@ -1,8 +1,8 @@
- - [[!traillink Your_data_won't_be_saved_unless_explicitly_asked|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]
- - [[!traillink Type_passwords_securely_on_an_untrusted_computer|encryption_and_privacy/virtual_keyboard]]
- - [[!traillink Create_and_use_encrypted_volumes|encryption_and_privacy/encrypted_volumes]]
- - [[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]
+ - [[Your data won't be saved unless explicitely asked|encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked]]
+ - [[Type passwords securely on an untrusted computer|encryption_and_privacy/virtual_keyboard]]
+ - [[Create and use encrypted volumes|encryption_and_privacy/encrypted_volumes]]
+ - [[TrueCrypt|encryption_and_privacy/truecrypt]]
- Use OpenPGP
- - [[!traillink Encrypt_text_with_a_passphrase_using_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]
- - [[!traillink Encrypt_and_sign_text_with_a_public_key_using_gedit|encryption_and_privacy/openpgp_with_gedit]]
- - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]
+ - [[Encrypt text with a passphrase using gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]
+ - [[Encrypt and sign text with a public key using gedit|encryption_and_privacy/openpgp_with_gedit]]
+ - [[Securely delete files and clean diskspace using Nautilus Wipe|encryption_and_privacy/secure_deletion]]
diff --git a/wiki/src/doc/encryption_and_privacy.index.pt.po b/wiki/src/doc/encryption_and_privacy.index.pt.po
index 7ec329d..5ca0d23 100644
--- a/wiki/src/doc/encryption_and_privacy.index.pt.po
+++ b/wiki/src/doc/encryption_and_privacy.index.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 16:32+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,38 +18,37 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Your_data_won't_be_saved_unless_explicitly_asked|"
-"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
-msgstr "[[!traillink Seus_dados_não_serão_salvos_a_não_ser_que_você_peça_"
-"explicitamente|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+"[[Your data won't be saved unless explicitely asked|encryption_and_privacy/"
+"your_data_wont_be_saved_unless_explicitely_asked]]"
+msgstr "[[Seus dados não serão salvos a não ser que você peça "
+"explicitamente|encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked]]"
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Type_passwords_securely_on_an_untrusted_computer|"
-"encryption_and_privacy/virtual_keyboard]]"
-msgstr "[[!traillink Digite_senhas_de_forma_segura_em_computadores_não_"
+"[[Type passwords securely on an untrusted computer|encryption_and_privacy/"
+"virtual_keyboard]]"
+msgstr "[[Digite senhas de forma segura em computadores não "
"confiáveis|encryption_and_privacy/virtual_keyboard]]"
#. type: Bullet: ' - '
msgid ""
-"[[!traillink Create_and_use_encrypted_volumes|encryption_and_privacy/"
-"encrypted_volumes]]"
-msgstr "[[!traillink Crie_e_use_volumes_criptografados|encryption_and_privacy/encrypted_volumes]]"
+"[[Create and use encrypted volumes|encryption_and_privacy/encrypted_volumes]]"
+msgstr "[[Crie e use volumes criptografados|encryption_and_privacy/encrypted_volumes]]"
#. type: Bullet: ' - '
-msgid "[[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]"
+msgid "[[TrueCrypt|encryption_and_privacy/truecrypt]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" - Use OpenPGP\n"
-" - [[!traillink Encrypt_text_with_a_passphrase_using_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Encrypt_and_sign_text_with_a_public_key_using_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Encrypt text with a passphrase using gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Encrypt and sign text with a public key using gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Securely delete files and clean diskspace using Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
msgstr ""
" - Use OpenPGP\n"
-" - [[!traillink Criptografe_textos_com_uma_senha_usando_o_gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
-" - [[!traillink Criptografe_e_assine_textos_com_uma_chave_pública_usando_gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
-" - [[!traillink Apague_arquivos_de_forma_segura_e_limpe_o_espaço_em_disco_usando_o_"
-"Nautilus_Wipe|encryption_and_privacy/secure_deletion]]\n"
+" - [[Criptografe textos com uma senha usando o gpgApplet|encryption_and_privacy/openpgp_passphrase_encryption]]\n"
+" - [[Criptografe e assine textos com uma chave pública usando gedit|encryption_and_privacy/openpgp_with_gedit]]\n"
+" - [[Apague arquivos de forma segura e limpe o espaço em disco usando o "
+"Nautilus Wipe|encryption_and_privacy/secure_deletion]]\n"
diff --git a/wiki/src/doc/encryption_and_privacy.pt.po b/wiki/src/doc/encryption_and_privacy.pt.po
index bcf2e90..d50e5b1 100644
--- a/wiki/src/doc/encryption_and_privacy.pt.po
+++ b/wiki/src/doc/encryption_and_privacy.pt.po
@@ -3,6 +3,7 @@
# 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"
@@ -47,4 +48,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.pt\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po
index f1a9343..0ed0afc 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Your data won't be saved unless explicitly asked\"]]\n"
+msgid "[[!meta title=\"Your data won't be saved unless explicitely asked\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po
index f1a9343..0ed0afc 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Your data won't be saved unless explicitly asked\"]]\n"
+msgid "[[!meta title=\"Your data won't be saved unless explicitely asked\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po
index 1dc9b75..2b808cf 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Your data won't be saved unless explicitly asked\"]]\n"
+msgid "[[!meta title=\"Your data won't be saved unless explicitely asked\"]]\n"
msgstr "[[!meta title=\"Vos données ne seront pas sauvegardées à moins que vous ne le demandiez explicitement\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn
index 48fc665..cb754b8 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Your data won't be saved unless explicitly asked"]]
+[[!meta title="Your data won't be saved unless explicitely asked"]]
As stated in the [[about]] page, Tails is designed to leave no trace on the
computer you're using unless you ask it explicitly. It is important
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.pt.po
index 1362ba1..9ff5170 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Your data won't be saved unless explicitly asked\"]]\n"
+msgid "[[!meta title=\"Your data won't be saved unless explicitely asked\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps.de.po b/wiki/src/doc/first_steps.de.po
index 27b186b..bfc34f03f 100644
--- a/wiki/src/doc/first_steps.de.po
+++ b/wiki/src/doc/first_steps.de.po
@@ -3,6 +3,7 @@
# 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"
@@ -23,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.de\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/first_steps.es.po b/wiki/src/doc/first_steps.es.po
index b8dbabb..bfc34f03f 100644
--- a/wiki/src/doc/first_steps.es.po
+++ b/wiki/src/doc/first_steps.es.po
@@ -3,6 +3,7 @@
# 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"
@@ -23,4 +24,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.es\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/first_steps.fr.po b/wiki/src/doc/first_steps.fr.po
index 71af62e..71a98ed 100644
--- a/wiki/src/doc/first_steps.fr.po
+++ b/wiki/src/doc/first_steps.fr.po
@@ -3,6 +3,7 @@
# 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"
@@ -23,4 +24,4 @@ msgstr "[[!meta title=\"Vos premiers pas avec Tails\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.fr\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index 8783cd6..95d7508 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: 2012-07-21 00:05+0300\n"
+"POT-Creation-Date: 2012-06-07 12:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,26 +19,26 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_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 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 Logging_in_to_captive_portals|first_steps/unsafe_browser]]\n"
-" - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
+" - [[Installing onto a USB Stick|first_steps/usb_installation]] (recommended)\n"
+" - [[Manually Installing onto a USB Stick|first_steps/manual_usb_installation]],\n"
+" for [[Linux|first_steps/manual_usb_installation/linux]],\n"
+" for [[Windows|first_steps/manual_usb_installation/windows]],\n"
+" for [[Mac|first_steps/manual_usb_installation/mac]]\n"
+" - [[Uninstalling Tails or Resetting a USB Stick|first_steps/usb_reset]],\n"
+" for [[Linux|first_steps/usb_reset/linux]],\n"
+" for [[Windows|first_steps/usb_reset/windows]]\n"
+" - [[Upgrading a Tails USB Stick|first_steps/usb_upgrade]]\n"
+" - [[Start Tails|first_steps/start_tails]]\n"
+" - [[Startup Options|first_steps/startup_options]]\n"
+" - [[Administration Password|first_steps/startup_options/administration_password]]\n"
+" - [[Tor Bridge Mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[Windows Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[Introduction to GNOME and the Tails Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[Persistence|first_steps/persistence]]\n"
+" - [[Warnings About Persistence|first_steps/persistence/warnings]]\n"
+" - [[Create & Configure the Persistent Volume|first_steps/persistence/configure]]\n"
+" - [[Enable & Use the Persistent Volume|first_steps/persistence/use]]\n"
+" - [[Delete the Persistent Volume|first_steps/persistence/delete]]\n"
+" - [[Logging in to captive portals|first_steps/unsafe_browser]]\n"
+" - [[Reporting Bugs|first_steps/bug_reporting]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps.index.es.po b/wiki/src/doc/first_steps.index.es.po
index 8783cd6..95d7508 100644
--- a/wiki/src/doc/first_steps.index.es.po
+++ b/wiki/src/doc/first_steps.index.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-21 00:05+0300\n"
+"POT-Creation-Date: 2012-06-07 12:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,26 +19,26 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_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 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 Logging_in_to_captive_portals|first_steps/unsafe_browser]]\n"
-" - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
+" - [[Installing onto a USB Stick|first_steps/usb_installation]] (recommended)\n"
+" - [[Manually Installing onto a USB Stick|first_steps/manual_usb_installation]],\n"
+" for [[Linux|first_steps/manual_usb_installation/linux]],\n"
+" for [[Windows|first_steps/manual_usb_installation/windows]],\n"
+" for [[Mac|first_steps/manual_usb_installation/mac]]\n"
+" - [[Uninstalling Tails or Resetting a USB Stick|first_steps/usb_reset]],\n"
+" for [[Linux|first_steps/usb_reset/linux]],\n"
+" for [[Windows|first_steps/usb_reset/windows]]\n"
+" - [[Upgrading a Tails USB Stick|first_steps/usb_upgrade]]\n"
+" - [[Start Tails|first_steps/start_tails]]\n"
+" - [[Startup Options|first_steps/startup_options]]\n"
+" - [[Administration Password|first_steps/startup_options/administration_password]]\n"
+" - [[Tor Bridge Mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[Windows Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[Introduction to GNOME and the Tails Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[Persistence|first_steps/persistence]]\n"
+" - [[Warnings About Persistence|first_steps/persistence/warnings]]\n"
+" - [[Create & Configure the Persistent Volume|first_steps/persistence/configure]]\n"
+" - [[Enable & Use the Persistent Volume|first_steps/persistence/use]]\n"
+" - [[Delete the Persistent Volume|first_steps/persistence/delete]]\n"
+" - [[Logging in to captive portals|first_steps/unsafe_browser]]\n"
+" - [[Reporting Bugs|first_steps/bug_reporting]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index c45b6d5..f070572 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-21 00:05+0300\n"
+"POT-Creation-Date: 2012-06-07 12:57+0300\n"
"PO-Revision-Date: 2012-06-26 13:05-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_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 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 Logging_in_to_captive_portals|first_steps/unsafe_browser]]\n"
-" - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
+" - [[Installing onto a USB Stick|first_steps/usb_installation]] (recommended)\n"
+" - [[Manually Installing onto a USB Stick|first_steps/manual_usb_installation]],\n"
+" for [[Linux|first_steps/manual_usb_installation/linux]],\n"
+" for [[Windows|first_steps/manual_usb_installation/windows]],\n"
+" for [[Mac|first_steps/manual_usb_installation/mac]]\n"
+" - [[Uninstalling Tails or Resetting a USB Stick|first_steps/usb_reset]],\n"
+" for [[Linux|first_steps/usb_reset/linux]],\n"
+" for [[Windows|first_steps/usb_reset/windows]]\n"
+" - [[Upgrading a Tails USB Stick|first_steps/usb_upgrade]]\n"
+" - [[Start Tails|first_steps/start_tails]]\n"
+" - [[Startup Options|first_steps/startup_options]]\n"
+" - [[Administration Password|first_steps/startup_options/administration_password]]\n"
+" - [[Tor Bridge Mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[Windows Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[Introduction to GNOME and the Tails Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[Persistence|first_steps/persistence]]\n"
+" - [[Warnings About Persistence|first_steps/persistence/warnings]]\n"
+" - [[Create & Configure the Persistent Volume|first_steps/persistence/configure]]\n"
+" - [[Enable & Use the Persistent Volume|first_steps/persistence/use]]\n"
+" - [[Delete the Persistent Volume|first_steps/persistence/delete]]\n"
+" - [[Logging in to captive portals|first_steps/unsafe_browser]]\n"
+" - [[Reporting Bugs|first_steps/bug_reporting]]\n"
msgstr ""
-" - [[!traillink Installation_sur_une_clé_USB|first_steps/usb_installation]] (recommandée)\n"
-" - [[!traillink Installation_manuelle_sur_une_clé_USB|first_steps/manual_usb_installation]],\n"
-" avec [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" avec [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" avec [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Désinstaller_Tails_ou_réinitialiser_une_clé_USB|first_steps/usb_reset]],\n"
-" avec [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" avec [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Mettre_à_jour_une_clé_USB_Tails|first_steps/usb_upgrade]]\n"
-" - [[!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 Introduction_à_GNOME_et_au_bureau_de_Tails|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
-" - [[!traillink Persistance|first_steps/persistence]]\n"
-" - [[!traillink Avertissement_à_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 S'identifier_auprès_d'un_portail_captif|first_steps/unsafe_browser]]\n"
-" - [[!traillink Rapporter_un_bug|first_steps/bug_reporting]]\n"
+" - [[Installation sur une clé USB|first_steps/usb_installation]] (recommandée)\n"
+" - [[Installation manuelle sur une clé USB|first_steps/manual_usb_installation]],\n"
+" avec [[Linux|first_steps/manual_usb_installation/linux]],\n"
+" avec [[Windows|first_steps/manual_usb_installation/windows]],\n"
+" avec [[Mac|first_steps/manual_usb_installation/mac]]\n"
+" - [[Désinstaller Tails ou réinitialiser une clé USB|first_steps/usb_reset]],\n"
+" avec [[Linux|first_steps/usb_reset/linux]],\n"
+" avec [[Windows|first_steps/usb_reset/windows]]\n"
+" - [[Mettre à jour une clé USB Tails|first_steps/usb_upgrade]]\n"
+" - [[Démarrer Tails|first_steps/start_tails]]\n"
+" - [[Options de démarrage|first_steps/startup_options]]\n"
+" - [[Mot de passe administrateur|first_steps/startup_options/administration_password]]\n"
+" - [[Tor en mode 'Bridge'|first_steps/startup_options/bridge_mode]]\n"
+" - [[Thème Windows Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[Introduction à GNOME et au bureau de Tails|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[Persistance|first_steps/persistence]]\n"
+" - [[Avertissement à propos de la persistance|first_steps/persistence/warnings]]\n"
+" - [[Créer et configurer un volume persistant|first_steps/persistence/configure]]\n"
+" - [[Activer et utiliser le volume persistant|first_steps/persistence/use]]\n"
+" - [[Effacer le volume persistant|first_steps/persistence/delete]]\n"
+" - [[S'identifier auprès d'un portail captif|first_steps/unsafe_browser]]\n"
+" - [[Rapporter un bug|first_steps/bug_reporting]]\n"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index 8a62280..ea2d0b6 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,22 +1,22 @@
- - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],
- for [[!traillink Linux|first_steps/manual_usb_installation/linux]],
- for [[!traillink Windows|first_steps/manual_usb_installation/windows]],
- for [[!traillink Mac|first_steps/manual_usb_installation/mac]]
- - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],
- for [[!traillink Linux|first_steps/usb_reset/linux]],
- for [[!traillink Windows|first_steps/usb_reset/windows]]
- - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_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 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 Logging_in_to_captive_portals|first_steps/unsafe_browser]]
- - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]
+ - [[Installing onto a USB Stick|first_steps/usb_installation]] (recommended)
+ - [[Manually Installing onto a USB Stick|first_steps/manual_usb_installation]],
+ for [[Linux|first_steps/manual_usb_installation/linux]],
+ for [[Windows|first_steps/manual_usb_installation/windows]],
+ for [[Mac|first_steps/manual_usb_installation/mac]]
+ - [[Uninstalling Tails or Resetting a USB Stick|first_steps/usb_reset]],
+ for [[Linux|first_steps/usb_reset/linux]],
+ for [[Windows|first_steps/usb_reset/windows]]
+ - [[Upgrading a Tails USB Stick|first_steps/usb_upgrade]]
+ - [[Start Tails|first_steps/start_tails]]
+ - [[Startup Options|first_steps/startup_options]]
+ - [[Administration Password|first_steps/startup_options/administration_password]]
+ - [[Tor Bridge Mode|first_steps/startup_options/bridge_mode]]
+ - [[Windows Camouflage|first_steps/startup_options/windows_camouflage]]
+ - [[Introduction to GNOME and the Tails Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]
+ - [[Persistence|first_steps/persistence]]
+ - [[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]]
+ - [[Logging in to captive portals|first_steps/unsafe_browser]]
+ - [[Reporting Bugs|first_steps/bug_reporting]]
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index d922436..85bb96c 100644
--- a/wiki/src/doc/first_steps.index.pt.po
+++ b/wiki/src/doc/first_steps.index.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-21 00:15+0300\n"
+"POT-Creation-Date: 2012-06-13 18:09+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,28 +19,28 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_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 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 Logging_in_to_captive_portals|first_steps/unsafe_browser]]\n"
-" - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
+" - [[Installing onto a USB Stick|first_steps/usb_installation]] (recommended)\n"
+" - [[Manually Installing onto a USB Stick|first_steps/manual_usb_installation]],\n"
+" for [[Linux|first_steps/manual_usb_installation/linux]],\n"
+" for [[Windows|first_steps/manual_usb_installation/windows]],\n"
+" for [[Mac|first_steps/manual_usb_installation/mac]]\n"
+" - [[Uninstalling Tails or Resetting a USB Stick|first_steps/usb_reset]],\n"
+" for [[Linux|first_steps/usb_reset/linux]],\n"
+" for [[Windows|first_steps/usb_reset/windows]]\n"
+" - [[Upgrading a Tails USB Stick|first_steps/usb_upgrade]]\n"
+" - [[Start Tails|first_steps/start_tails]]\n"
+" - [[Startup Options|first_steps/startup_options]]\n"
+" - [[Administration Password|first_steps/startup_options/administration_password]]\n"
+" - [[Tor Bridge Mode|first_steps/startup_options/bridge_mode]]\n"
+" - [[Windows Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+" - [[Introduction to GNOME and the Tails Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+" - [[Persistence|first_steps/persistence]]\n"
+" - [[Warnings About Persistence|first_steps/persistence/warnings]]\n"
+" - [[Create & Configure the Persistent Volume|first_steps/persistence/configure]]\n"
+" - [[Enable & Use the Persistent Volume|first_steps/persistence/use]]\n"
+" - [[Delete the Persistent Volume|first_steps/persistence/delete]]\n"
+" - [[Logging in to captive portals|first_steps/unsafe_browser]]\n"
+" - [[Reporting Bugs|first_steps/bug_reporting]]\n"
msgstr ""
" - [[Instalando em uma memória USB|first_steps/usb_installation]] (recomendado)\n"
" - [[Instalando manualmente em uma memória USB|first_steps/manual_usb_installation]],\n"
diff --git a/wiki/src/doc/first_steps.pt.po b/wiki/src/doc/first_steps.pt.po
index 1739e11..a543231 100644
--- a/wiki/src/doc/first_steps.pt.po
+++ b/wiki/src/doc/first_steps.pt.po
@@ -3,6 +3,7 @@
# 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"
@@ -23,4 +24,4 @@ msgstr "[[!meta title=\"Primeiros passos com Tails\"]]"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps.index.pt\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/configure.pt.po b/wiki/src/doc/first_steps/persistence/configure.pt.po
index 2aea975..f41bee8 100644
--- a/wiki/src/doc/first_steps/persistence/configure.pt.po
+++ b/wiki/src/doc/first_steps/persistence/configure.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-21 00:15+0300\n"
+"POT-Creation-Date: 2012-06-28 10:58+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wiki/src/doc/sensitive_documents.de.po b/wiki/src/doc/sensitive_documents.de.po
index c2803dd..145a563 100644
--- a/wiki/src/doc/sensitive_documents.de.po
+++ b/wiki/src/doc/sensitive_documents.de.po
@@ -30,4 +30,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/sensitive_documents.index.de\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/sensitive_documents.es.po b/wiki/src/doc/sensitive_documents.es.po
index 7254c33..ada15d7 100644
--- a/wiki/src/doc/sensitive_documents.es.po
+++ b/wiki/src/doc/sensitive_documents.es.po
@@ -30,4 +30,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/sensitive_documents.index.es\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/sensitive_documents.fr.po b/wiki/src/doc/sensitive_documents.fr.po
index 4d94326..ada15d7 100644
--- a/wiki/src/doc/sensitive_documents.fr.po
+++ b/wiki/src/doc/sensitive_documents.fr.po
@@ -3,6 +3,7 @@
# 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"
@@ -29,4 +30,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/sensitive_documents.index.fr\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/sensitive_documents.index.de.po b/wiki/src/doc/sensitive_documents.index.de.po
index 29aa96f..d85e169 100644
--- a/wiki/src/doc/sensitive_documents.index.de.po
+++ b/wiki/src/doc/sensitive_documents.index.de.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:41+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Office_suite|sensitive_documents/office_suite]]"
+msgid "[[Office suite|sensitive_documents/office_suite]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Graphics|sensitive_documents/graphics]]"
+msgid "[[Graphics|sensitive_documents/graphics]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Desktop_publishing|sensitive_documents/desktop_publishing]]"
+msgid "[[Desktop publishing|sensitive_documents/desktop_publishing]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Audio|sensitive_documents/audio]]"
+msgid "[[Audio|sensitive_documents/audio]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Printing_and_scanning|sensitive_documents/"
-"printing_and_scanning]]"
+msgid "[[Printing and scanning|sensitive_documents/printing_and_scanning]]"
msgstr ""
diff --git a/wiki/src/doc/sensitive_documents.index.es.po b/wiki/src/doc/sensitive_documents.index.es.po
index 530e11e..ddf535d 100644
--- a/wiki/src/doc/sensitive_documents.index.es.po
+++ b/wiki/src/doc/sensitive_documents.index.es.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:41+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,26 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Office_suite|sensitive_documents/office_suite]]"
+msgid "[[Office suite|sensitive_documents/office_suite]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Graphics|sensitive_documents/graphics]]"
+msgid "[[Graphics|sensitive_documents/graphics]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Desktop_publishing|sensitive_documents/desktop_publishing]]"
+msgid "[[Desktop publishing|sensitive_documents/desktop_publishing]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[!traillink Audio|sensitive_documents/audio]]"
+msgid "[[Audio|sensitive_documents/audio]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Printing_and_scanning|sensitive_documents/"
-"printing_and_scanning]]"
+msgid "[[Printing and scanning|sensitive_documents/printing_and_scanning]]"
msgstr ""
#~ msgid ""
diff --git a/wiki/src/doc/sensitive_documents.index.fr.po b/wiki/src/doc/sensitive_documents.index.fr.po
index 1a499f7..60e9415 100644
--- a/wiki/src/doc/sensitive_documents.index.fr.po
+++ b/wiki/src/doc/sensitive_documents.index.fr.po
@@ -3,10 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-22 16:41+0300\n"
+"POT-Creation-Date: 2012-04-14 21:37+0300\n"
"PO-Revision-Date: 2012-05-17 21:37+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -16,26 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Office_suite|sensitive_documents/office_suite]]"
-msgstr "[[!traillink Suite_bureautique|sensitive_documents/office_suite]]"
+msgid "[[Office suite|sensitive_documents/office_suite]]"
+msgstr "[[Suite bureautique|sensitive_documents/office_suite]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Graphics|sensitive_documents/graphics]]"
-msgstr "[[!traillink Graphisme|sensitive_documents/graphics]]"
+msgid "[[Graphics|sensitive_documents/graphics]]"
+msgstr "[[Graphisme|sensitive_documents/graphics]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Desktop_publishing|sensitive_documents/desktop_publishing]]"
-msgstr ""
-"[[!traillink Publication_Assistée_par_Ordinateur|sensitive_documents/"
-"desktop_publishing]]"
+msgid "[[Desktop publishing|sensitive_documents/desktop_publishing]]"
+msgstr "[[Publication Assistée par Ordinateur|sensitive_documents/desktop_publishing]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Audio|sensitive_documents/audio]]"
-msgstr "[[!traillink Audio|sensitive_documents/audio]]"
+msgid "[[Audio|sensitive_documents/audio]]"
+msgstr "[[Audio|sensitive_documents/audio]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Printing_and_scanning|sensitive_documents/"
-"printing_and_scanning]]"
-msgstr "[[!traillink Imprimer_et_scanner|sensitive_documents/printing_and_scanning]]"
+msgid "[[Printing and scanning|sensitive_documents/printing_and_scanning]]"
+msgstr "[[Imprimer et scanner|sensitive_documents/printing_and_scanning]]"
diff --git a/wiki/src/doc/sensitive_documents.index.mdwn b/wiki/src/doc/sensitive_documents.index.mdwn
index 0e554be..9f37158 100644
--- a/wiki/src/doc/sensitive_documents.index.mdwn
+++ b/wiki/src/doc/sensitive_documents.index.mdwn
@@ -1,5 +1,5 @@
- - [[!traillink Office_suite|sensitive_documents/office_suite]]
- - [[!traillink Graphics|sensitive_documents/graphics]]
- - [[!traillink Desktop_publishing|sensitive_documents/desktop_publishing]]
- - [[!traillink Audio|sensitive_documents/audio]]
- - [[!traillink Printing_and_scanning|sensitive_documents/printing_and_scanning]]
+ - [[Office suite|sensitive_documents/office_suite]]
+ - [[Graphics|sensitive_documents/graphics]]
+ - [[Desktop publishing|sensitive_documents/desktop_publishing]]
+ - [[Audio|sensitive_documents/audio]]
+ - [[Printing and scanning|sensitive_documents/printing_and_scanning]]
diff --git a/wiki/src/doc/sensitive_documents.index.pt.po b/wiki/src/doc/sensitive_documents.index.pt.po
index f7d2f6c..2551207 100644
--- a/wiki/src/doc/sensitive_documents.index.pt.po
+++ b/wiki/src/doc/sensitive_documents.index.pt.po
@@ -3,10 +3,11 @@
# 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: 2012-07-22 16:41+0300\n"
+"POT-Creation-Date: 2012-06-06 23:52+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Office_suite|sensitive_documents/office_suite]]"
-msgstr "[[!traillink Programas_para_escritório|sensitive_documents/office_suite]]"
+msgid "[[Office suite|sensitive_documents/office_suite]]"
+msgstr "[[Programas para escritório|sensitive_documents/office_suite]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Graphics|sensitive_documents/graphics]]"
-msgstr "[[!traillink Gráficos|sensitive_documents/graphics]]"
+msgid "[[Graphics|sensitive_documents/graphics]]"
+msgstr "[[Gráficos|sensitive_documents/graphics]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Desktop_publishing|sensitive_documents/desktop_publishing]]"
-msgstr "[[!traillink Editoração|sensitive_documents/desktop_publishing]]"
+msgid "[[Desktop publishing|sensitive_documents/desktop_publishing]]"
+msgstr "[[Editoração|sensitive_documents/desktop_publishing]]"
#. type: Bullet: ' - '
-msgid "[[!traillink Audio|sensitive_documents/audio]]"
-msgstr "[[!traillink Áudio|sensitive_documents/audio]]"
+msgid "[[Audio|sensitive_documents/audio]]"
+msgstr "[[Áudio|sensitive_documents/audio]]"
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Printing_and_scanning|sensitive_documents/"
-"printing_and_scanning]]"
-msgstr "[[!traillink Imprimindo_e_escaneando|sensitive_documents/printing_and_scanning]]"
+msgid "[[Printing and scanning|sensitive_documents/printing_and_scanning]]"
+msgstr "[[Imprimindo e escaneando|sensitive_documents/printing_and_scanning]]"
diff --git a/wiki/src/doc/sensitive_documents.pt.po b/wiki/src/doc/sensitive_documents.pt.po
index 1eaa59b..d2ad535 100644
--- a/wiki/src/doc/sensitive_documents.pt.po
+++ b/wiki/src/doc/sensitive_documents.pt.po
@@ -3,6 +3,7 @@
# 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"
@@ -30,4 +31,4 @@ msgstr "Tails tem como objetivo prover um ambiente \"seguro\" para a "
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/sensitive_documents.index.pt\" raw=\"yes\"]]\n"
+msgstr ""
diff --git a/wiki/src/doc/walkthrough.fr.po b/wiki/src/doc/walkthrough.fr.po
index f100eb8..d102e72 100644
--- a/wiki/src/doc/walkthrough.fr.po
+++ b/wiki/src/doc/walkthrough.fr.po
@@ -84,7 +84,7 @@ msgid ""
"with security in mind; all outgoing connections to the Internet are forced to "
"go through [the Tor network](https://www.torproject.org/), whose purpose is "
"to protect them against traffic analysis. Moreover, Tails is designed to "
-"leave no trace on local storage devices unless explicitly asked."
+"leave no trace on local storage devices unless explicitely asked."
msgstr ""
"Il contient de nombreuses applications (navigateur web, client mail,\n"
"logiciel de messagerie instantanée, PAO, traitement de texte, d'image,\n"
diff --git a/wiki/src/local.css b/wiki/src/local.css
index fde3f80..f54c08d 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -21,7 +21,6 @@ Table of Content:
- Language Toolbar
- Icons
- Documentation Styling
- - Trail
- Special Cases
*/
@@ -1055,47 +1054,6 @@ div.tip {
background-image: url(lib/admon-tip.png);
}
-/* Trail */
-
-div.trail {
- height: 2em;
- border: solid 1px #bbb;
- margin-bottom: 1.5em;
-}
-
-div.pageheader div.trail {
- margin-left: 20px;
-}
-
-div.trail span.trailup {
- display: none;
-}
-
-div.trail span.trailarrow {
- position: absolute;
-}
-
-div.trail span.trailprev, div.trail span.trailnext {
- width: 40%;
- margin-top: 0.25em;
-}
-
-div.trail span.trailprev {
- left: 0.5em;
-}
-
-div.trail span.trailprev a {
- margin-left: 1.5em;
-}
-
-div.trail span.trailnext {
- right: 1.5em;
-}
-
-div.trail span.trailnext a {
- margin-right: 0.5em;
-}
-
/* Special Cases */
/* doc/get/trusting_tails_signing_key */
diff --git a/wiki/src/templates/page.tmpl b/wiki/src/templates/page.tmpl
index b8215a5..d01787e 100644
--- a/wiki/src/templates/page.tmpl
+++ b/wiki/src/templates/page.tmpl
@@ -187,8 +187,6 @@
<TMPL_UNLESS DYNAMIC>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
-<TMPL_VAR TRAILS>
-
<TMPL_IF TAGS>
<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
Tags:
diff --git a/wiki/src/todo/better_internal_disks_lock.mdwn b/wiki/src/todo/better_internal_disks_lock.mdwn
index be55d33..eda2677 100644
--- a/wiki/src/todo/better_internal_disks_lock.mdwn
+++ b/wiki/src/todo/better_internal_disks_lock.mdwn
@@ -3,7 +3,7 @@
Tails user can currently access their local hard disks. It is only possible
when an administrative password is set at boot time, but still it would
be better to make internal drives read-only at kernel level to prevent
-anything bad from happening, unless explicitly desired. The later
+anything bad from happening, unless explicitely desired. The later
is useful to wipe a file or the whole device.
About implementation: live-boot's `readonly` option does the read-only
diff --git a/wiki/src/todo/documentation_translation.mdwn b/wiki/src/todo/documentation_translation.mdwn
index 096a19d..2a1e3db 100644
--- a/wiki/src/todo/documentation_translation.mdwn
+++ b/wiki/src/todo/documentation_translation.mdwn
@@ -49,7 +49,7 @@ The following pages are not up-to-date or will be rewritten at some point.
- [[/doc/anonymous_internet/vidalia]]
- [[/doc/anonymous_internet/pidgin]]
- [[/doc/anonymous_internet/thunderbird]]
-- [[/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]
+- [[/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked]]
- [[/doc/encryption_and_privacy/virtual_keyboard]]
- [[/doc/encryption_and_privacy/truecrypt]]
- [[/doc/sensitive_documents/office_suite]]
diff --git a/wiki/src/todo/get_rid_of_the_restart_Tor_launcher.mdwn b/wiki/src/todo/get_rid_of_the_restart_Tor_launcher.mdwn
index 6aee538..5835c1c 100644
--- a/wiki/src/todo/get_rid_of_the_restart_Tor_launcher.mdwn
+++ b/wiki/src/todo/get_rid_of_the_restart_Tor_launcher.mdwn
@@ -15,7 +15,7 @@ maintainer).
> be an annoying misunderstanding, though: as old circuits are still
> displayed, and probably used for pre-existing connections, one can
> easily fear the NEWNYM feature did not work. Vidalia is more explicit
-> wrt. this feature: it explicitly tells the NEWNYM applies to new
+> wrt. this feature: it explicitely tells the NEWNYM applies to new
> connections only. Let's wait until we
> [[ship Vidalia instead of TorK]], before removing this launcher, then!