Revert "Revert "Merge branch 'master' into doc/trail""

This reverts commit 5a9c39a6.

Revert "Revert "Merge branch 'master' into doc/trail""
This reverts commit 5a9c39a6.
bc83025f · Tails developers · 5a9c39a6 · bc83025f · bc83025f · bc83025f
Commit bc83025f authored Aug 05, 2012 by Tails developers
75 changed files
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Description: a Tor-ified, amnesic Live System
 The Amnesic Incognito Live System is aimed at preserving its users' privacy:
   - any outgoing connection to the Internet is forced to go through
     the Tor network
-   - no trace is left on local storage devices unless explicitely asked
+   - no trace is left on local storage devices unless explicitly asked
 .
 This package provides the source and tools that are necessary to build
 such a Live System using Debian Live.
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -24,3 +24,4 @@ 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]
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
 Data persistence is a somewhat tricky topic in a Live system context,
-especially one explicitely designed to avoid leaving any trace of
+especially one explicitly designed to avoid leaving any trace of
 its use.

 Some real-life usecases however require to setup some kind of data

--- 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
-   explicitely discourage users to plug their Tails USB stick to a
+   explicitly 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.

--- 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 explicitely torified in Tails:
+   GNOME proxy settings, *and* is not explicitly 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?

--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -3,11 +3,10 @@
 # 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-05-22 16:26+0300\n"
+"POT-Creation-Date: 2012-07-22 18:30+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"
@@ -38,34 +37,13 @@ msgstr ""

 #. type: Title #
 #, no-wrap
-msgid "General information"
+msgid "[[General information|about]]"
 msgstr ""

-#. 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: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/about.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -75,7 +53,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/get.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -85,7 +63,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -95,7 +73,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/anonymous_internet.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -105,7 +83,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -115,7 +93,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/sensitive_documents.index.de\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -125,7 +103,11 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr ""
+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]]"

 #~ msgid "[[First time user?|download#index1h1]]"
 #~ msgstr "[[Neuer Benutzer?|download#index1h1]]"
@@ -133,7 +115,6 @@ msgstr ""
 #~ 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/"

--- a/wiki/src/doc.es.po
+++ b/wiki/src/doc.es.po
@@ -3,11 +3,10 @@
 # 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-05-22 16:26+0300\n"
+"POT-Creation-Date: 2012-07-22 18:30+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"
@@ -37,33 +36,13 @@ msgid "- [[Introduction to this documentation|introduction]]"
 msgstr "- [[Introducción a esta documentación|introduction]]"

 #. type: Title #
-#, no-wrap
-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]]"
+msgid "[[General information|about]]"
+msgstr "[[Información general|about]]"

-#. 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: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/about.index.es\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -71,10 +50,8 @@ 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/sensitive_documents.index.es\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/get.index.es\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -84,7 +61,7 @@ msgstr "[[Primeros pasos con Tails|first_steps]]"
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps.index.es\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -94,7 +71,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 ""
+msgstr "[[!inline pages=\"doc/anonymous_internet.index.es\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -104,7 +81,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 ""
+msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.es\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -124,7 +101,7 @@ msgstr "[[Temas avanzados|advanced_topics]]"
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\"]]\n"

 #~ msgid ""
 #~ "- [[Why do you need anonymity?|about/anonymity]] - [[System requirements|"
@@ -155,7 +132,6 @@ msgstr ""
 #~ 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/"

--- 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-05-22 16:26+0300\n"
+"POT-Creation-Date: 2012-07-22 18:30+0300\n"
 "PO-Revision-Date: 2012-06-05 15:57+0100\n"
 "Last-Translator: MR\n"
 "Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -36,33 +36,13 @@ msgid "- [[Introduction to this documentation|introduction]]"
 msgstr "- [[Introduction sur cette documentation|introduction]]"

 #. type: Title #
-#, no-wrap
-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]]"
+msgid "[[General information|about]]"
+msgstr "[[Informations générales|about]]"

-#. 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: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/about.index.fr\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -117,13 +97,31 @@ msgstr "[[!inline pages=\"doc/sensitive_documents.index.fr\" raw=\"yes\"]]\n"
 #. type: Title #
 #, no-wrap
 msgid "[[Advanced topics|advanced_topics]]"
-msgstr "[[Discussions avancés|advanced_topics]]"
+msgstr "[[Sujets 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/"

--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -6,14 +6,9 @@ to write it yourself and share it with us.

 - [[Introduction to this documentation|introduction]]

-# 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]]
+# [[General information|about]]
+
+[[!inline pages="doc/about.index" raw="yes"]]

 # [[Get Tails|download]]


--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -32,33 +32,13 @@ msgid "- [[Introduction to this documentation|introduction]]"
 msgstr "- [[Introdução a esta documentação|introduction]]"

 #. type: Title #
-#, no-wrap
-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]]"
+msgid "[[General information|about]]"
+msgstr "[[Informações gerais|about]]"

-#. 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: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/about.index.pt\" raw=\"yes\"]]\n"

 #. type: Title #
 #, no-wrap
@@ -148,3 +128,47 @@ 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]]"
--- a/wiki/src/doc/about.de.po
+++ b/wiki/src/doc/about.de.po
+# 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"
--- a/wiki/src/doc/about.es.po
+++ b/wiki/src/doc/about.es.po
+# 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"
--- a/wiki/src/doc/about.fr.po
+++ b/wiki/src/doc/about.fr.po
+# 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"
--- a/wiki/src/doc/about.index.de.po
+++ b/wiki/src/doc/about.index.de.po
+# 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 ""
--- a/wiki/src/doc/about.index.es.po
+++ b/wiki/src/doc/about.index.es.po
+# 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]]"
--- a/wiki/src/doc/about.index.fr.po
+++ b/wiki/src/doc/about.index.fr.po
+# 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"