summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-04-15 00:50:35 +0200
committerTails developers <amnesia@boum.org>2012-04-15 00:50:35 +0200
commita4ab454bff52d46ebed0f8670a3171ec60aedacd (patch)
tree652c9a39d2318084a294b38656096b0d2b8eedfd
parentfdc53ff4e4cdaf2ff121e4bb5ead63785c3077df (diff)
Kill a zillion broken links.
-rw-r--r--wiki/src/about.de.po18
-rw-r--r--wiki/src/bugs.mdwn2
-rw-r--r--wiki/src/bugs/Tails_0.9_doesn__39__t_open_.onion_sites_.mdwn2
-rw-r--r--wiki/src/bugs/Updating_WIN_programs__40__IrfanView__44__IMGBurn__38__Belarc_Advisor__41___do_not_play_well..mdwn2
-rw-r--r--wiki/src/bugs/fromiso_not_working.mdwn2
-rw-r--r--wiki/src/bugs/too_long_startup_when_hdd_bios_password_enabled.mdwn2
-rw-r--r--wiki/src/contribute.de.po6
-rw-r--r--wiki/src/contribute.es.po4
-rw-r--r--wiki/src/contribute.fr.po4
-rw-r--r--wiki/src/contribute.html2
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn2
-rw-r--r--wiki/src/doc.de.po29
-rw-r--r--wiki/src/doc.es.po14
-rw-r--r--wiki/src/doc.fr.po14
-rw-r--r--wiki/src/doc/anonymous_internet/iceweasel.de.po4
-rw-r--r--wiki/src/doc/anonymous_internet/iceweasel.es.po4
-rw-r--r--wiki/src/doc/anonymous_internet/iceweasel.fr.po4
-rw-r--r--wiki/src/doc/anonymous_internet/iceweasel.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png (renamed from wiki/src/doc/encryption_and_privacy/encrypted_volumes/encryped_partition.fr.png)bin33320 -> 33320 bytes
-rw-r--r--wiki/src/doc/first_steps.index.de.po4
-rw-r--r--wiki/src/doc/first_steps.index.es.po4
-rw-r--r--wiki/src/doc/first_steps.index.fr.po4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.de.po4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.es.po6
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fr.po6
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.mdwn2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po4
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po4
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn2
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset.de.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset.es.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset.fr.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset.intro.de.po6
-rw-r--r--wiki/src/doc/first_steps/usb_reset.intro.es.po6
-rw-r--r--wiki/src/doc/first_steps/usb_reset.intro.fr.po6
-rw-r--r--wiki/src/doc/first_steps/usb_reset/linux.de.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset/linux.es.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset/linux.fr.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset/windows.de.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset/windows.es.po4
-rw-r--r--wiki/src/doc/first_steps/usb_reset/windows.fr.po4
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po4
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.es.po4
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po14
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html2
-rw-r--r--wiki/src/doc/walkthrough.fr.po2
-rw-r--r--wiki/src/download.de.po21
-rw-r--r--wiki/src/download.es.po2
-rw-r--r--wiki/src/download.fr.po22
-rw-r--r--wiki/src/download.html2
-rw-r--r--wiki/src/getting_started.de.po10
-rw-r--r--wiki/src/getting_started.fr.po10
-rw-r--r--wiki/src/index.es.po11
-rw-r--r--wiki/src/news/report_2011_01-02.mdwn2
-rw-r--r--wiki/src/news/report_2011_05-06.mdwn2
-rw-r--r--wiki/src/news/version_0.10.mdwn2
-rw-r--r--wiki/src/security.de.po7
-rw-r--r--wiki/src/security.fr.po7
-rw-r--r--wiki/src/security/ineffective_firewall-level_Tor_enforcement.fr.po4
-rw-r--r--wiki/src/sidebar.de.po4
-rw-r--r--wiki/src/support/found_a_problem.de.po28
-rw-r--r--wiki/src/support/found_a_problem.es.po27
-rw-r--r--wiki/src/support/found_a_problem.fr.po25
-rw-r--r--wiki/src/support/found_a_problem.html2
-rw-r--r--wiki/src/todo/adapt_documentation_from_Incognito.mdwn2
-rw-r--r--wiki/src/todo/documentation_translation.mdwn10
-rw-r--r--wiki/src/todo/usb_install_and_upgrade.mdwn2
-rw-r--r--wiki/src/todo/usb_install_and_upgrade/todo.mdwn2
-rw-r--r--wiki/src/todo/vpn_support.mdwn2
71 files changed, 204 insertions, 245 deletions
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index 3798026..ef6024c 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -67,12 +67,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails is [[Free Software|doc/license]] and based on [[Debian GNU/Linux|"
-#| "http://www.debian.org/]]. It comes with several built-in applications pre-"
-#| "configured with security in mind: web browser, instant messaging client, "
-#| "email client, office suite, image and sound editor, etc."
msgid ""
"Tails comes with several built-in applications pre-configured with security "
"in mind: web browser, instant messaging client, email client, office suite, "
@@ -304,10 +298,6 @@ msgstr ""
"Tails und Tor besser zu verstehen,"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "more details about the [[features and software|doc/features]] included in "
-#| "Tails,"
msgid ""
"more details about the [[features and software|doc/about/features]] included "
"in Tails,"
@@ -454,11 +444,3 @@ msgstr ""
#. type: Bullet: '* '
msgid "[ELE](http://www.northernsecurity.net/download/ele/) (dead link)"
msgstr ""
-
-#~ msgid "**FIXME**: end paste from index\n"
-#~ msgstr ""
-#~ "Tails ist ein Live System: ein komplettes Betriebssystem das dafür "
-#~ "geschaffen wurde, unabhängig des bereits installierten Betriebssystems "
-#~ "eines Computers von einer CD oder einem USB-Stick aus zu arbeiten. Es ist "
-#~ "[[Freie Software|doc/license]] und basiert auf [[Debian GNU/Linux|http://"
-#~ "www.debian.org/]]."
diff --git a/wiki/src/bugs.mdwn b/wiki/src/bugs.mdwn
index 51b8e9d..97ac02d 100644
--- a/wiki/src/bugs.mdwn
+++ b/wiki/src/bugs.mdwn
@@ -5,7 +5,7 @@
<p>
If you've found a bug in The Amnesic Incognito Live System, please read the
-[[bug reporting instructions|doc/first_steps/report_a_bug]] and post about it here. TODO
+[[bug reporting instructions|doc/first_steps/bug_reporting]] and post about it here. TODO
items go [[elsewhere|todo]].
</p>
diff --git a/wiki/src/bugs/Tails_0.9_doesn__39__t_open_.onion_sites_.mdwn b/wiki/src/bugs/Tails_0.9_doesn__39__t_open_.onion_sites_.mdwn
index ef14fa4..0531be4 100644
--- a/wiki/src/bugs/Tails_0.9_doesn__39__t_open_.onion_sites_.mdwn
+++ b/wiki/src/bugs/Tails_0.9_doesn__39__t_open_.onion_sites_.mdwn
@@ -26,7 +26,7 @@ SOCKS error: TTL expired
>
> It should also be noted that hidden services running a recent enough Tor
> (>=0.2.3.7-alpha) will not produce this problem, see [[!tor_bug 3460]].
-> For instance, [[duskgytldkxiuqc6.onion]] is not affected and it's known to
+> For instance, `duskgytldkxiuqc6.onion` is not affected and it's known to
> run a sufficiently new Tor.
>> Worked around in Tails 0.10.
diff --git a/wiki/src/bugs/Updating_WIN_programs__40__IrfanView__44__IMGBurn__38__Belarc_Advisor__41___do_not_play_well..mdwn b/wiki/src/bugs/Updating_WIN_programs__40__IrfanView__44__IMGBurn__38__Belarc_Advisor__41___do_not_play_well..mdwn
index e78c4ac..14aa3ee 100644
--- a/wiki/src/bugs/Updating_WIN_programs__40__IrfanView__44__IMGBurn__38__Belarc_Advisor__41___do_not_play_well..mdwn
+++ b/wiki/src/bugs/Updating_WIN_programs__40__IrfanView__44__IMGBurn__38__Belarc_Advisor__41___do_not_play_well..mdwn
@@ -1,7 +1,7 @@
Updating the above used to be "normal" using Firefox however not using Tor.Had to switch to never used & insecure IE to complete the updates.
> I don't understand what you are trying to do with Tails, what fails
-> and how; please read our [[bug reporting guidelines|doc/first_steps/report_a_bug]]
+> and how; please read our [[bug reporting guidelines|doc/first_steps/bug_reporting]]
> and provide the needed information, else there is nothing we can do
> about it and we'll have to close this bug. --intrigeri
diff --git a/wiki/src/bugs/fromiso_not_working.mdwn b/wiki/src/bugs/fromiso_not_working.mdwn
index d802258..8236e90 100644
--- a/wiki/src/bugs/fromiso_not_working.mdwn
+++ b/wiki/src/bugs/fromiso_not_working.mdwn
@@ -1,5 +1,5 @@
fromiso command not found on boot
> Works for me => [[done]].
-> Please follow the [[bug reporting instructions|doc/first_steps/report_a_bug]] when
+> Please follow the [[bug reporting instructions|doc/first_steps/bug_reporting]] when
> you'll reopen this bug with enough information.
diff --git a/wiki/src/bugs/too_long_startup_when_hdd_bios_password_enabled.mdwn b/wiki/src/bugs/too_long_startup_when_hdd_bios_password_enabled.mdwn
index 43856ce..4ff6528 100644
--- a/wiki/src/bugs/too_long_startup_when_hdd_bios_password_enabled.mdwn
+++ b/wiki/src/bugs/too_long_startup_when_hdd_bios_password_enabled.mdwn
@@ -1,6 +1,6 @@
Too long boot if hdd password bios enabled. Scanning hdd... and no boot.
-> Please read our [[bug reporting guidelines|doc/first_steps/report_a_bug]]. We can't
+> Please read our [[bug reporting guidelines|doc/first_steps/bug_reporting]]. We can't
> do anything useful with this bug report in its current state.
>> 3 months without further info => closing: [[done]]
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index 59fc8b8..c0bf2e5 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:58+0300\n"
+"POT-Creation-Date: 2012-04-14 23:45+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"
@@ -45,8 +45,8 @@ msgid "[[Improve documentation|contribute/how/documentation]]"
msgstr "[[Verbessern Sie die Dokumentation|contribute/how/documentation]]"
#. type: Content of: <div><div><p><ul><li>
-msgid "[[Reporting Bugs|doc/first_steps/report_a_bug]]"
-msgstr "[[Melden Sie einen Bug (Fehler)|doc/first_steps/report_a_bug]]"
+msgid "[[Reporting Bugs|doc/first_steps/bug_reporting]]"
+msgstr "[[Melden Sie einen Bug (Fehler)|doc/first_steps/bug_reporting]]"
#. type: Content of: <div><div><p><ul><li>
msgid "[[Spread the word|contribute/how/promote]]"
diff --git a/wiki/src/contribute.es.po b/wiki/src/contribute.es.po
index f4950bc..e5c52e1 100644
--- a/wiki/src/contribute.es.po
+++ b/wiki/src/contribute.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:58+0300\n"
+"POT-Creation-Date: 2012-04-14 23:45+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"
@@ -41,7 +41,7 @@ msgid "[[Improve documentation|contribute/how/documentation]]"
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-msgid "[[Reporting Bugs|doc/first_steps/report_a_bug]]"
+msgid "[[Reporting Bugs|doc/first_steps/bug_reporting]]"
msgstr ""
#. type: Content of: <div><div><p><ul><li>
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index de1a616..1ae5766b 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:58+0300\n"
+"POT-Creation-Date: 2012-04-14 23:45+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"
@@ -41,7 +41,7 @@ msgid "[[Improve documentation|contribute/how/documentation]]"
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-msgid "[[Reporting Bugs|doc/first_steps/report_a_bug]]"
+msgid "[[Reporting Bugs|doc/first_steps/bug_reporting]]"
msgstr ""
#. type: Content of: <div><div><p><ul><li>
diff --git a/wiki/src/contribute.html b/wiki/src/contribute.html
index 055f36a..057ec4c 100644
--- a/wiki/src/contribute.html
+++ b/wiki/src/contribute.html
@@ -12,7 +12,7 @@ There are many ways <strong>you</strong> can contribute to Tails:
<li>[[Setup a BitTorrent or HTTP mirror|contribute/how/mirror]]</li>
<li>[[Help other Tails users|contribute/how/help]]</li>
<li>[[Improve documentation|contribute/how/documentation]]</li>
- <li>[[Reporting Bugs|doc/first_steps/report_a_bug]]</li>
+ <li>[[Reporting Bugs|doc/first_steps/bug_reporting]]</li>
<li>[[Spread the word|contribute/how/promote]]</li>
<li>[[Fix a bug|contribute/how/code]]</li>
<li>[[Implement a new feature|contribute/how/code]]</li>
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
index 9204468..0a373e9 100644
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
+++ b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
@@ -7,7 +7,7 @@
Pick one of those:
* [[erase_memory_on_shutdown/qemu_pmemsave]] (pros: no initial setup)
-* [[erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn]]
+* [[erase_memory_on_shutdown/virtualbox_dumpguestcore]]
(pros: no initial setup)
* [[erase_memory_on_shutdown/pxedump]] (pros: works for bare metal,
possible to `|grep` and avoid writting the huge dump file to disk;
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index cb1c5c5..f08ad63 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -130,8 +130,8 @@ msgstr ""
#, fuzzy
#~| 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"
+#~| " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~| " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
#~| "- [[Stay tuned|download#index5h1]]\n"
#~| "- [[Starting Tails!|download#index6h1]]\n"
#~ msgid ""
@@ -140,15 +140,15 @@ msgstr ""
#~ " - [[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"
+#~ " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
+#~ " - [[Installing onto a USB stick, for Mac|first_steps/manual_usb_installation/mac]]\n"
#~ "- [[Stay tuned|download#index5h1]]\n"
#~ "- [[Starting Tails!|download#index6h1]]\n"
#~ msgstr ""
#~ "- [[Eine CD brennen, oder auf einem USB-Stick installieren|download#index4h1]]\n"
-#~ " - [[Auf einem USB-Stick installieren, unter Linux|installing_onto_a_usb_stick/linux]]\n"
-#~ " - [[Auf einem USB-Stick installieren, unter Windows|installing_onto_a_usb_stick/windows]]\n"
+#~ " - [[Auf einem USB-Stick installieren, unter Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Auf einem USB-Stick installieren, unter Windows|first_steps/manual_usb_installation/windows]]\n"
#~ "- [[Auf dem aktuellen Stand bleiben!|download#index5h1]]\n"
#~ "- [[Tails starten!|download#index6h1]]\n"
@@ -168,16 +168,15 @@ msgstr ""
#~ msgstr "Tails benutzen"
#~ msgid ""
-#~ "- [[Start Tails|use/start]]\n"
+#~ "- [[Start Tails|first_steps/start_tails]]\n"
#~ " - [[Use Tails inside a virtualization software|advanced_topics/"
#~ "virtualization]]\n"
-#~ "- [[Use the Tails desktop|use/desktop]]\n"
+#~ "- [[Use the Tails desktop|doc/first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
#~ "- [[Connect to the Internet anonymously|anonymous_internet]]\n"
-#~ "- [[Work on sensitive documents|use/work_on_sensitive_document]]\n"
-#~ "- [[Use encryption|use/encryption]]\n"
+#~ "- [[Work on sensitive documents|sensitive_documents]]\n"
+#~ "- [[Use encryption|doc/encryption_and_privacy]]\n"
#~ " - [[TrueCrypt|doc/encryption_and_privacy/truecrypt]]\n"
-#~ "- [[Report Tails bugs|use/debugging]]\n"
-#~ "- [[Other applications and features|use/other_applications]]\n"
+#~ "- [[Report Tails bugs|doc/first_steps/bug_reporting]]\n"
#~ msgstr ""
-#~ "- [[Schritt-für-Schritt|support/walkthrough]] - [[Virtualisierung|support/"
-#~ "virtualization]] - [[TrueCrypt|support/truecrypt]]"
+#~ "- [[Virtualisierung|support/"
+#~ "virtualization]] - [[TrueCrypt|doc/encryption_and_privacy/truecrypt]]"
diff --git a/wiki/src/doc.es.po b/wiki/src/doc.es.po
index 62ef38e..c62c0d7 100644
--- a/wiki/src/doc.es.po
+++ b/wiki/src/doc.es.po
@@ -138,8 +138,8 @@ msgstr ""
#, fuzzy
#~| 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"
+#~| " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~| " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
#~| "- [[Stay tuned|download#index5h1]]\n"
#~| "- [[Starting Tails!|download#index6h1]]\n"
#~ msgid ""
@@ -148,15 +148,15 @@ msgstr ""
#~ " - [[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"
+#~ " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
+#~ " - [[Installing onto a USB stick, for Mac|first_steps/manual_usb_installation/mac]]\n"
#~ "- [[Stay tuned|download#index5h1]]\n"
#~ "- [[Starting Tails!|download#index6h1]]\n"
#~ msgstr ""
#~ "- [[Grabar un CD o instalar en una memoria USB|download#index4h1]]\n"
-#~ " - [[Instalar en una memoria USB, para Linux|installing_onto_a_usb_stick/linux]]\n"
-#~ " - [[Instalar en una memoria USB, para Windows|installing_onto_a_usb_stick/windows]]\n"
+#~ " - [[Instalar en una memoria USB, para Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Instalar en una memoria USB, para Windows|first_steps/manual_usb_installation/windows]]\n"
#~ "- [[Mantente actualizado|download#index5h1]]\n"
#~ "- [[¡Inicia Tails!|download#index6h1]]\n"
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index d143619..e3b11cf 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -136,8 +136,8 @@ msgstr ""
#, fuzzy
#~| 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"
+#~| " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~| " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
#~| "- [[Stay tuned|download#index5h1]]\n"
#~| "- [[Starting Tails!|download#index6h1]]\n"
#~ msgid ""
@@ -146,15 +146,15 @@ msgstr ""
#~ " - [[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"
+#~ " - [[Installing onto a USB stick, for Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Installing onto a USB stick, for Windows|first_steps/manual_usb_installation/windows]]\n"
+#~ " - [[Installing onto a USB stick, for Mac|first_steps/manual_usb_installation/mac]]\n"
#~ "- [[Stay tuned|download#index5h1]]\n"
#~ "- [[Starting Tails!|download#index6h1]]\n"
#~ msgstr ""
#~ "- [[Graver un CD ou installer sur une clef USB|download#index4h1]]\n"
-#~ " - [[Installer sur une clef USB, sous Linux|installing_onto_a_usb_stick/linux]]\n"
-#~ " - [[Installer sur une clef USB, sous Windows|installing_onto_a_usb_stick/windows]]\n"
+#~ " - [[Installer sur une clef USB, sous Linux|first_steps/manual_usb_installation/linux]]\n"
+#~ " - [[Installer sur une clef USB, sous Windows|first_steps/manual_usb_installation/windows]]\n"
#~ "- [[Suivez les nouveautés !|download#index5h1]]\n"
#~ "- [[Démarrer Tails !|download#index6h1]]\n"
diff --git a/wiki/src/doc/anonymous_internet/iceweasel.de.po b/wiki/src/doc/anonymous_internet/iceweasel.de.po
index a613f2a..83439ce 100644
--- a/wiki/src/doc/anonymous_internet/iceweasel.de.po
+++ b/wiki/src/doc/anonymous_internet/iceweasel.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 21:21+0300\n"
+"POT-Creation-Date: 2012-04-14 23:44+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"
@@ -58,7 +58,7 @@ msgstr ""
msgid ""
"All the data exchanged between your browser and the server you are visiting "
"are encrypted. It prevents the [[Tor exit node to eavesdrop on your "
-"communication|doc/about/warnings#exit_node]]."
+"communication|doc/about/warning#exit_node]]."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet/iceweasel.es.po b/wiki/src/doc/anonymous_internet/iceweasel.es.po
index 78bcd6e..5158ec6 100644
--- a/wiki/src/doc/anonymous_internet/iceweasel.es.po
+++ b/wiki/src/doc/anonymous_internet/iceweasel.es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2012-04-14 21:21+0300\n"
+"POT-Creation-Date: 2012-04-14 23:44+0300\n"
"PO-Revision-Date: 2012-02-28 22:39-0600\n"
"Last-Translator: Alfredo Rubio <alfrb76@hotmail.com>\n"
"Language-Team: SPANISH <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid ""
"All the data exchanged between your browser and the server you are visiting "
"are encrypted. It prevents the [[Tor exit node to eavesdrop on your "
-"communication|doc/about/warnings#exit_node]]."
+"communication|doc/about/warning#exit_node]]."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet/iceweasel.fr.po b/wiki/src/doc/anonymous_internet/iceweasel.fr.po
index b8a64fb..2816415 100644
--- a/wiki/src/doc/anonymous_internet/iceweasel.fr.po
+++ b/wiki/src/doc/anonymous_internet/iceweasel.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 21:21+0300\n"
+"POT-Creation-Date: 2012-04-14 23:44+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"
@@ -64,7 +64,7 @@ msgstr ""
msgid ""
"All the data exchanged between your browser and the server you are visiting "
"are encrypted. It prevents the [[Tor exit node to eavesdrop on your "
-"communication|doc/about/warnings#exit_node]]."
+"communication|doc/about/warning#exit_node]]."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet/iceweasel.mdwn b/wiki/src/doc/anonymous_internet/iceweasel.mdwn
index c5fa0d7..86932fc 100644
--- a/wiki/src/doc/anonymous_internet/iceweasel.mdwn
+++ b/wiki/src/doc/anonymous_internet/iceweasel.mdwn
@@ -18,7 +18,7 @@ Using HTTPS instead of HTTP encrypts your communication while browsing the web.
All the data exchanged between your browser and the server you are visiting are
encrypted. It prevents the
-[[Tor exit node to eavesdrop on your communication|doc/about/warnings#exit_node]].
+[[Tor exit node to eavesdrop on your communication|doc/about/warning#exit_node]].
HTTPS also includes mechanisms to authenticate the server you are communicating
with. But those mechanisms can be flawed,
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encryped_partition.fr.png b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png
index 68ccc45..68ccc45 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encryped_partition.fr.png
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png
Binary files differ
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index aadae0d..7fb66ab 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-04-14 23:14+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -24,7 +24,7 @@ msgid ""
" 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"
-" - [[Deleting Tails from a USB Stick|first_steps/usb_reset]],\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"
diff --git a/wiki/src/doc/first_steps.index.es.po b/wiki/src/doc/first_steps.index.es.po
index aadae0d..7fb66ab 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-04-14 23:14+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -24,7 +24,7 @@ msgid ""
" 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"
-" - [[Deleting Tails from a USB Stick|first_steps/usb_reset]],\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"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index aadae0d..7fb66ab 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:14+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -24,7 +24,7 @@ msgid ""
" 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"
-" - [[Deleting Tails from a USB Stick|first_steps/usb_reset]],\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"
diff --git a/wiki/src/doc/first_steps/bug_reporting.de.po b/wiki/src/doc/first_steps/bug_reporting.de.po
index 5cbbd90..46df197 100644
--- a/wiki/src/doc/first_steps/bug_reporting.de.po
+++ b/wiki/src/doc/first_steps/bug_reporting.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 19:59+0300\n"
+"POT-Creation-Date: 2012-04-15 00:27+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"
@@ -73,7 +73,7 @@ msgstr ""
msgid ""
"**WhisperBack is an application written specifically to report bugs anonymously\n"
"from inside Tails. If you are not able to use WhisperBack, see the [[special\n"
-"cases|report_a_bug#special_cases]].**\n"
+"cases|bug_reporting#special_cases]].**\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/bug_reporting.es.po b/wiki/src/doc/first_steps/bug_reporting.es.po
index 1f54a6e..8a28089 100644
--- a/wiki/src/doc/first_steps/bug_reporting.es.po
+++ b/wiki/src/doc/first_steps/bug_reporting.es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2012-04-14 19:59+0300\n"
+"POT-Creation-Date: 2012-04-15 00:27+0300\n"
"PO-Revision-Date: 2012-03-03 09:01-0600\n"
"Last-Translator: Alfredo Rubio <alfrb76@hotmail.com>\n"
"Language-Team: SPANISH <LL@li.org>\n"
@@ -81,11 +81,11 @@ msgstr "Usa WhisperBack\n"
msgid ""
"**WhisperBack is an application written specifically to report bugs anonymously\n"
"from inside Tails. If you are not able to use WhisperBack, see the [[special\n"
-"cases|report_a_bug#special_cases]].**\n"
+"cases|bug_reporting#special_cases]].**\n"
msgstr ""
"**WhisperBack es una aplicación programada específicamente para notificar anónimamente errores\n"
"dentro de Tails. Si no te es posible usar WhisperBack, vee los [[casos\n"
-"especiales|report_a_bug#special_cases]].**\n"
+"especiales|bug_reporting#special_cases]].**\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps/bug_reporting.fr.po b/wiki/src/doc/first_steps/bug_reporting.fr.po
index fe6ce1e..62b910a 100644
--- a/wiki/src/doc/first_steps/bug_reporting.fr.po
+++ b/wiki/src/doc/first_steps/bug_reporting.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 19:59+0300\n"
+"POT-Creation-Date: 2012-04-15 00:27+0300\n"
"PO-Revision-Date: 2012-02-28 13:29+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,11 +81,11 @@ msgstr "Utilisez Whisperback\n"
msgid ""
"**WhisperBack is an application written specifically to report bugs anonymously\n"
"from inside Tails. If you are not able to use WhisperBack, see the [[special\n"
-"cases|report_a_bug#special_cases]].**\n"
+"cases|bug_reporting#special_cases]].**\n"
msgstr ""
"**WhisperBack est une applciation écrite spécialement pour rapport les bugs de manière anonyme\n"
"depuis Tails. Si vous n'arrivez pas à utiliser WhisperBack, reportez-vous aux [[cas\n"
-"spécifiques|report_a_bug#special_cases]].**\n"
+"spécifiques|bug_reporting#special_cases]].**\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps/bug_reporting.mdwn b/wiki/src/doc/first_steps/bug_reporting.mdwn
index fc5cece..e799305 100644
--- a/wiki/src/doc/first_steps/bug_reporting.mdwn
+++ b/wiki/src/doc/first_steps/bug_reporting.mdwn
@@ -27,7 +27,7 @@ Use WhisperBack
**WhisperBack is an application written specifically to report bugs anonymously
from inside Tails. If you are not able to use WhisperBack, see the [[special
-cases|report_a_bug#special_cases]].**
+cases|bug_reporting#special_cases]].**
WhisperBack will help you fill-up a bug report, including relevant technical
details and send it to us encrypted and through Tor.
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index fb85986..6fb0f0a 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -385,7 +385,7 @@ msgid ""
"<div class=\"text\">\n"
"<strong>Report a bug</strong>: open a dedicated application to report bugs from\n"
"inside Tails<br/>\n"
-"[[See the corresponding documentation|first_steps/report_a_bug]]\n"
+"[[See the corresponding documentation|first_steps/bug_reporting]]\n"
"</div>\n"
"</div>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po
index 490eb8e..527095c 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po
@@ -492,7 +492,7 @@ msgid ""
"<div class=\"text\">\n"
"<strong>Report a bug</strong>: open a dedicated application to report bugs from\n"
"inside Tails<br/>\n"
-"[[See the corresponding documentation|first_steps/report_a_bug]]\n"
+"[[See the corresponding documentation|first_steps/bug_reporting]]\n"
"</div>\n"
"</div>\n"
msgstr ""
@@ -501,7 +501,7 @@ msgstr ""
"<div class=\"text\">\n"
"<strong>Reporte de errores</strong>: abre una aplicación especial para notificar cualquier error\n"
"de Tails<br/>\n"
-"[[Ve la documentación correspondiente|first_steps/report_a_bug]]\n"
+"[[Ve la documentación correspondiente|first_steps/bug_reporting]]\n"
"</div>\n"
"</div>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index b413731..870d6c5 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -519,7 +519,7 @@ msgid ""
"<div class=\"text\">\n"
"<strong>Report a bug</strong>: open a dedicated application to report bugs from\n"
"inside Tails<br/>\n"
-"[[See the corresponding documentation|first_steps/report_a_bug]]\n"
+"[[See the corresponding documentation|first_steps/bug_reporting]]\n"
"</div>\n"
"</div>\n"
msgstr ""
@@ -527,7 +527,7 @@ msgstr ""
"<div class=\"image\"><img src=\"whisperback.png\"/></div>\n"
"<div class=\"text\">\n"
"<strong>Faire un rapport de bug</strong> : ouvre une application dédiée aux rappports de bugs dans Tails<br/>\n"
-"[[Voir la documentation|first_steps/report_a_bug]]\n"
+"[[Voir la documentation|first_steps/bug_reporting]]\n"
"</div>\n"
"</div>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
index ac6dcf1..f17a963 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
@@ -218,7 +218,7 @@ Tails website and documentation</div>
<div class="text">
<strong>Report a bug</strong>: open a dedicated application to report bugs from
inside Tails<br/>
-[[See the corresponding documentation|first_steps/report_a_bug]]
+[[See the corresponding documentation|first_steps/bug_reporting]]
</div>
</div>
diff --git a/wiki/src/doc/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index 79672e1..43a87b8 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -112,8 +112,8 @@ msgstr ""
"pouvoir démarrer Tails à partir de cette clé USB. Cela peut se produire si vous fermez\n"
" la fenêtre de l'assistant ou débranchez la clé USB pendant la création du volume\n"
"persistant. Pour résoudre ce problème, vous devez\n"
-"[[supprimer|first_steps/resetting_a_usb_stick]] et\n"
-"[[réinstaller|first_steps/usb_installer]] Tails.\n"
+"[[supprimer|first_steps/usb_reset]] et\n"
+"[[réinstaller|first_steps/usb_installation]] Tails.\n"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/first_steps/usb_reset.de.po b/wiki/src/doc/first_steps/usb_reset.de.po
index 034cf4e..4a324b0 100644
--- a/wiki/src/doc/first_steps/usb_reset.de.po
+++ b/wiki/src/doc/first_steps/usb_reset.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Deleting Tails from a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset.es.po b/wiki/src/doc/first_steps/usb_reset.es.po
index 034cf4e..4a324b0 100644
--- a/wiki/src/doc/first_steps/usb_reset.es.po
+++ b/wiki/src/doc/first_steps/usb_reset.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Deleting Tails from a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset.fr.po b/wiki/src/doc/first_steps/usb_reset.fr.po
index 034cf4e..4a324b0 100644
--- a/wiki/src/doc/first_steps/usb_reset.fr.po
+++ b/wiki/src/doc/first_steps/usb_reset.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Deleting Tails from a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.de.po b/wiki/src/doc/first_steps/usb_reset.intro.de.po
index 68379a4..98e3d06 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.de.po
+++ b/wiki/src/doc/first_steps/usb_reset.intro.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:53+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"To delete Tails from a USB stick, and use it for something else, you have to "
-"reset it."
+"To uninstall Tails from a USB stick, and use it for something else, you have "
+"to reset it."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.es.po b/wiki/src/doc/first_steps/usb_reset.intro.es.po
index 68379a4..98e3d06 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.es.po
+++ b/wiki/src/doc/first_steps/usb_reset.intro.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:53+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"To delete Tails from a USB stick, and use it for something else, you have to "
-"reset it."
+"To uninstall Tails from a USB stick, and use it for something else, you have "
+"to reset it."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.fr.po b/wiki/src/doc/first_steps/usb_reset.intro.fr.po
index 68379a4..98e3d06 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.fr.po
+++ b/wiki/src/doc/first_steps/usb_reset.intro.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:53+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"To delete Tails from a USB stick, and use it for something else, you have to "
-"reset it."
+"To uninstall Tails from a USB stick, and use it for something else, you have "
+"to reset it."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.de.po b/wiki/src/doc/first_steps/usb_reset/linux.de.po
index 115134a..ded9a21 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.de.po
+++ b/wiki/src/doc/first_steps/usb_reset/linux.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.es.po b/wiki/src/doc/first_steps/usb_reset/linux.es.po
index 115134a..ded9a21 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.es.po
+++ b/wiki/src/doc/first_steps/usb_reset/linux.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.fr.po b/wiki/src/doc/first_steps/usb_reset/linux.fr.po
index 115134a..ded9a21 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.fr.po
+++ b/wiki/src/doc/first_steps/usb_reset/linux.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.de.po b/wiki/src/doc/first_steps/usb_reset/windows.de.po
index e82012a..044f6f7 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.de.po
+++ b/wiki/src/doc/first_steps/usb_reset/windows.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.es.po b/wiki/src/doc/first_steps/usb_reset/windows.es.po
index e82012a..044f6f7 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.es.po
+++ b/wiki/src/doc/first_steps/usb_reset/windows.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.fr.po b/wiki/src/doc/first_steps/usb_reset/windows.fr.po
index e82012a..044f6f7 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.fr.po
+++ b/wiki/src/doc/first_steps/usb_reset/windows.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:20+0300\n"
+"POT-Creation-Date: 2012-04-14 23: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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Erasing Tails from a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
index 9aaac58..84b49ae 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-08 21:06+0100\n"
+"POT-Creation-Date: 2012-04-14 23:54+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"
@@ -147,7 +147,7 @@ msgstr ""
msgid ""
"This doesn't alter the validity of the signature according to the key you "
"downloaded. This warning rather has to do with the trust that you put in "
-"Tails signing key. See, [[Trusting Tails signing key|doc/"
+"Tails signing key. See, [[Trusting Tails signing key|doc/get/"
"trusting_tails_signing_key]]. To remove this warning you would have to "
"personnally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
"\"]]</span> Tails signing key with your own key."
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.es.po b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.es.po
index 9aaac58..84b49ae 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.es.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-08 21:06+0100\n"
+"POT-Creation-Date: 2012-04-14 23:54+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"
@@ -147,7 +147,7 @@ msgstr ""
msgid ""
"This doesn't alter the validity of the signature according to the key you "
"downloaded. This warning rather has to do with the trust that you put in "
-"Tails signing key. See, [[Trusting Tails signing key|doc/"
+"Tails signing key. See, [[Trusting Tails signing key|doc/get/"
"trusting_tails_signing_key]]. To remove this warning you would have to "
"personnally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
"\"]]</span> Tails signing key with your own key."
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po
index 4587f78..ba8d6c2 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-08 21:06+0100\n"
+"POT-Creation-Date: 2012-04-14 23:54+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"
@@ -162,10 +162,18 @@ msgid ""
msgstr ""
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This doesn't alter the validity of the signature according to the key you "
+#| "downloaded. This warning rather has to do with the trust that you put in "
+#| "Tails signing key. See, [[Trusting Tails signing key|doc/get/"
+#| "trusting_tails_signing_key]]. To remove this warning you would have to "
+#| "personnally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
+#| "\"]]</span> Tails signing key with your own key."
msgid ""
"This doesn't alter the validity of the signature according to the key you "
"downloaded. This warning rather has to do with the trust that you put in "
-"Tails signing key. See, [[Trusting Tails signing key|doc/"
+"Tails signing key. See, [[Trusting Tails signing key|doc/get/"
"trusting_tails_signing_key]]. To remove this warning you would have to "
"personnally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
"\"]]</span> Tails signing key with your own key."
@@ -173,7 +181,7 @@ msgstr ""
"Ceci n'altère pas la validité de la signature liée à la clé que vous avez "
"téléchargé. Cet avertissement a plutôt à voir avec la confiance que vous "
"portez à la clé de signature de Tails. Voir [[Faire confiance à la clé de "
-"signature de Tails|doc/trusting_tails_signing_key]]. Afin de ne plus avoir "
+"signature de Tails|doc/get/trusting_tails_signing_key]]. Afin de ne plus avoir "
"cet avertissement, vous devrez personnellement <span class=\"definition\">[[!"
"wikipedia Keysigning desc=\"signer\"]]</span> la clé de signature de Tails "
"avec votre propre clé."
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html
index 5c4284c..854e2c2 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html
+++ b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html
@@ -80,7 +80,7 @@ Primary key fingerprint: 0D24 B36A A9A2 A651 7878 7645 1202 821C BE2C D9C1
<p>This doesn't alter the validity of the signature according to the key
you downloaded. This warning rather has to do with the trust that you
put in Tails signing key. See, [[Trusting Tails signing
-key|doc/trusting_tails_signing_key]]. To remove this warning you would
+key|doc/get/trusting_tails_signing_key]]. To remove this warning you would
have to personnally <span class="definition">[[!wikipedia Keysigning
desc="sign"]]</span> Tails signing key with your own key.</p>
diff --git a/wiki/src/doc/walkthrough.fr.po b/wiki/src/doc/walkthrough.fr.po
index 6947e30..d102e72 100644
--- a/wiki/src/doc/walkthrough.fr.po
+++ b/wiki/src/doc/walkthrough.fr.po
@@ -404,7 +404,7 @@ msgid ""
"There are several other interesting security or Internet related applications "
"included in Tails some which we list and present briefly here. Those that "
"have graphical user interfaces (which most do) can be found in the "
-"*Applications* menu. A list is available on [[features]] page."
+"*Applications* menu. A list is available on features page."
msgstr ""
"Il ya plusieurs autres applications intéressantes concernant la sécurité ou "
"en relation avec internet incluses en Tails une partie d'entre elles sont "
diff --git a/wiki/src/download.de.po b/wiki/src/download.de.po
index 0aa9647..b8f06ca 100644
--- a/wiki/src/download.de.po
+++ b/wiki/src/download.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 20:02+0300\n"
+"POT-Creation-Date: 2012-04-14 23:49+0300\n"
"PO-Revision-Date: 2011-06-13 19:01+0200\n"
"Last-Translator: zon <oldbafox@hotmail.com>\n"
"Language-Team: zon <oldbafox@hotmail.com>\n"
@@ -55,9 +55,9 @@ msgid ""
"pages to make sure that Tails is the right tool for you and that you "
"understand well its limitations.</strong>"
msgstr ""
-"<strong>... dann lies Dir zuerst [[Über Tails|about]] und [[Warnung|doc/"
-"about/warning]] durch, damit Du weisst, ob Tails auch das richtige für Dich "
-"ist und Du auch dessen Grenzen gut verstehst.</strong>"
+"<strong>... dann lies Dir zuerst [[Über Tails|about]] und "
+"[[Warnung|doc/about/warning]] durch, damit Du weisst, ob Tails auch das "
+"richtige für Dich ist und Du auch dessen Grenzen gut verstehst.</strong>"
#. type: Content of: <div><div><h1>
msgid "Download the ISO image"
@@ -114,8 +114,8 @@ msgid ""
"If you're running a web server, you're most welcome to help us spread Tails "
"by [[setting up a web mirror|contribute/how/mirror]]."
msgstr ""
-"Jede Hilfe Tails weiter zu verbreiten ist mehr als willkommen - [[benutze "
-"BitTorrent oder richte ein neues Web-Mirror ein |contribute/how/mirror]]."
+"Jede Hilfe Tails weiter zu verbreiten ist mehr als willkommen - "
+"[[benutze BitTorrent oder richte ein neues Web-Mirror ein|contribute/how/mirror]]."
#. type: Content of: <div><div><div><h2>
msgid "BitTorrent download"
@@ -199,7 +199,7 @@ msgstr ""
"Diese Techniken basieren auf standard HTTPS und [[!wikipedia "
"Certificate_authority desc=\"Zertifizierungsstellen\"]] um dir Vertrauen in "
"den Inhalt dieser Website zu geben. Aber, [[wie auf unserer Warnungsseite "
-"erklärt|doc/warning#index3h1]], könntest du immer noch Opfer eines Man-in-"
+"erklärt|doc/about/warning#index3h1]], könntest du immer noch Opfer eines Man-in-"
"the-middle-Angriffs sein während du HTTPS benutzt. Auf dieser Homepage, "
"genauso wie auch auf jeder anderen im Internet."
@@ -323,8 +323,8 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
"But the Tails signing key that you downloaded from this website could be a "
-"fake one if you were victim of a [[man-in-the-middle attack|doc/about/"
-"warning#man-in-the-middle]]."
+"fake one if you were victim of a "
+"[[man-in-the-middle attack|doc/about/warning#man-in-the-middle]]."
msgstr ""
#. type: Content of: <div><div><p>
@@ -412,7 +412,8 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><p>
-msgid "[[See the corresponding documentation.|doc/first_steps/usb_installer]]"
+msgid ""
+"[[See the corresponding documentation.|doc/first_steps/usb_installation]]"
msgstr ""
#. type: Content of: <div><div><h1>
diff --git a/wiki/src/download.es.po b/wiki/src/download.es.po
index 4b16457..4f73a17 100644
--- a/wiki/src/download.es.po
+++ b/wiki/src/download.es.po
@@ -374,7 +374,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><p>
-msgid "[[See the corresponding documentation.|doc/first_steps/usb_installer]]"
+msgid "[[See the corresponding documentation.|doc/first_steps/usb_installation]]"
msgstr ""
#. type: Content of: <div><div><h1>
diff --git a/wiki/src/download.fr.po b/wiki/src/download.fr.po
index bdb57e0..804e0fe 100644
--- a/wiki/src/download.fr.po
+++ b/wiki/src/download.fr.po
@@ -326,8 +326,7 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "[[Trusting Tails signing key|doc/get/trusting_tails_signing_key]]"
msgstr ""
-"[[Faire confiance à la clef de signature Tails|doc/get/"
-"trusting_tails_signing_key]]"
+"[[Faire confiance à la clef de signature Tails|doc/get/trusting_tails_signing_key]]"
#. type: Content of: <div><div><h1>
msgid "Burn a DVD or install onto a USB stick"
@@ -423,7 +422,7 @@ msgstr ""
"éventuelle modification."
#. type: Content of: <div><div><p>
-msgid "[[See the corresponding documentation.|doc/first_steps/usb_installer]]"
+msgid "[[See the corresponding documentation.|doc/first_steps/usb_installation]]"
msgstr ""
#. type: Content of: <div><div><h1>
@@ -612,17 +611,12 @@ msgstr ""
#~ "Toutes les images ISO que nous diffusons peuvent être gravées sur CD ou "
#~ "installées sur une clef USB."
-#~ msgid "[[Instructions for Linux|doc/installing_onto_a_usb_stick/linux]]"
-#~ msgstr "[[Instructions pour Linux|doc/installing_onto_a_usb_stick/linux]]"
+#~ msgid "[[Instructions for Linux|doc/first_steps/manual_usb_installation/linux]]"
+#~ msgstr "[[Instructions pour Linux|doc/first_steps/manual_usb_installation/linux]]"
-#~ msgid "[[Instructions for Windows|doc/installing_onto_a_usb_stick/windows]]"
+#~ msgid "[[Instructions for Windows|doc/first_steps/manual_usb_installation/windows]]"
#~ msgstr ""
-#~ "[[Instructions pour Windows|doc/installing_onto_a_usb_stick/windows]]"
-
-#, fuzzy
-#~| msgid "[[Instructions for Linux|doc/installing_onto_a_usb_stick/linux]]"
-#~ msgid "[[Instructions for Mac|doc/installing_onto_a_usb_stick/mac]]"
-#~ msgstr "[[Instructions pour Linux|doc/installing_onto_a_usb_stick/linux]]"
+#~ "[[Instructions pour Windows|doc/first_steps/manual_usb_installation/windows]]"
#~ msgid ""
#~ "<strong>FIXME:</strong> mention Intel-based Mac users sometimes need to "
@@ -772,7 +766,7 @@ msgstr ""
#~ msgid ""
#~ "This doesn't alter the validity of the signature according to the key you "
#~ "downloaded. This warning rather has to do with the trust that you put in "
-#~ "Tails signing key. See, [[Trusting Tails signing key|doc/"
+#~ "Tails signing key. See, [[Trusting Tails signing key|doc/get/"
#~ "trusting_tails_signing_key]]. To remove this warning you would have to "
#~ "personnally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
#~ "\"]]</span> Tails signing key with your own key."
@@ -780,7 +774,7 @@ msgstr ""
#~ "Ceci n'altère pas la validité de la signature liée à la clé que vous avez "
#~ "téléchargé. Cet avertissement a plutôt à voir avec la confiance que vous "
#~ "portez à la clé de signature de Tails. Voir [[Faire confiance à la clé de "
-#~ "signature de Tails|doc/trusting_tails_signing_key]]. Afin de ne plus "
+#~ "signature de Tails|doc/get/trusting_tails_signing_key]]. Afin de ne plus "
#~ "avoir cet avertissement, vous devrez personnellement <span class="
#~ "\"definition\">[[!wikipedia Keysigning desc=\"signer\"]]</span> la clé de "
#~ "signature de Tails avec votre propre clé."
diff --git a/wiki/src/download.html b/wiki/src/download.html
index 2e99ce7..73dc9a5 100644
--- a/wiki/src/download.html
+++ b/wiki/src/download.html
@@ -225,7 +225,7 @@ share it without restriction.</strong>
</ul>
<p>[[See the corresponding
- documentation.|doc/first_steps/usb_installer]]</p>
+ documentation.|doc/first_steps/usb_installation]]</p>
</div> <!-- #support -->
diff --git a/wiki/src/getting_started.de.po b/wiki/src/getting_started.de.po
index 243b0b8..72abeaf 100644
--- a/wiki/src/getting_started.de.po
+++ b/wiki/src/getting_started.de.po
@@ -66,20 +66,12 @@ msgstr ""
"--------------------------\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "- Read our [[user documentation|doc]] to learn more about Tails and how "
-#| "to use it.\n"
-#| "<!-- - Check our [[FAQ]] for a more question/answer approach on the same "
-#| "topics. -->\n"
msgid ""
"- Read our [[user documentation|doc]] to learn more about Tails and how to "
"use it."
msgstr ""
"- Lesen Sie unsere [[Benutzer Dokumentation|doc]] um mehr über Tails und "
-"dessen Bedienung zu erfahren.\n"
-"<!-- - Wenden Sie sich an unsere [[FAQ]] für mehr Frage&Antwort-"
-"Lösungsansätze zu den gleichen Themen. -->\n"
+"dessen Bedienung zu erfahren."
#. type: Bullet: '- '
msgid ""
diff --git a/wiki/src/getting_started.fr.po b/wiki/src/getting_started.fr.po
index 9d68c46..def63bf 100644
--- a/wiki/src/getting_started.fr.po
+++ b/wiki/src/getting_started.fr.po
@@ -69,20 +69,12 @@ msgstr ""
"--------------------------\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "- Read our [[user documentation|doc]] to learn more about Tails and how "
-#| "to use it.\n"
-#| "<!-- - Check our [[FAQ]] for a more question/answer approach on the same "
-#| "topics. -->\n"
msgid ""
"- Read our [[user documentation|doc]] to learn more about Tails and how to "
"use it."
msgstr ""
"- Lisez notre [[documentation utilisateur|doc]] pour en savoir plus sur "
-"Tails et sur comment l'utiliser.\n"
-"<!-- - Jetez un oeil à notre [[FAQ]] pour une approche plus questions/"
-"réponses sur les mêmes sujets. -->\n"
+"Tails et sur comment l'utiliser."
#. type: Bullet: '- '
msgid ""
diff --git a/wiki/src/index.es.po b/wiki/src/index.es.po
index d84c1cd..6a188ab 100644
--- a/wiki/src/index.es.po
+++ b/wiki/src/index.es.po
@@ -118,8 +118,8 @@ msgstr "Véase [[Seguridad|Security]] para más información."
#~ "no deja ningun rastro en los dispositivos de almacenamiento locales a "
#~ "menos que sea explicitamente solicitado."
-#~ msgid "It has many other [[features]]."
-#~ msgstr "Tiene muchas otras [[funcionalidades|features]]."
+#~ msgid "It has many other features."
+#~ msgstr "Tiene muchas otras funcionalidades."
#, fuzzy
#~| msgid ""
@@ -145,9 +145,6 @@ msgstr "Véase [[Seguridad|Security]] para más información."
#~| msgid ""
#~| "You can send email to <amnesia@boum.org>, preferably encrypted with our "
#~| "[[OpenPGP key|doc/about/openpgp_keys]]."
-#~ msgid ""
-#~ "You can send email to <amnesia@boum.org>, preferably encrypted with our "
-#~ "[[OpenPGP key|doc/about/openpgp_keys]], or join our [[chatroom|chat]]."
#~ msgstr ""
#~ "Puedes escribir a <amnesia@boum.org>, preferentemente encriptado con "
#~ "nuestra [[llave GnuPG|doc/about/openpgp_keys]]."
@@ -174,11 +171,11 @@ msgstr "Véase [[Seguridad|Security]] para más información."
#~ msgstr "[[Documentación de ikiwiki |ikiwiki]]"
#~ msgid ""
-#~ "[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] can "
+#~ "[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|contribute/patch]] can "
#~ "be submitted and tracked using this wiki."
#~ msgstr ""
#~ "Puede enviar y seguir los [[Bugs]], la [[Lista de cosas por hacer|"
-#~ "TODO]] , [[sugerencias|wishlist]] , y [[patches|patch]] utilizando esta "
+#~ "TODO]] , [[sugerencias|wishlist]] , y [[patches|contribute/patch]] utilizando esta "
#~ "wiki."
#~ msgid "using amnesia"
diff --git a/wiki/src/news/report_2011_01-02.mdwn b/wiki/src/news/report_2011_01-02.mdwn
index e69baa6..3baddfd 100644
--- a/wiki/src/news/report_2011_01-02.mdwn
+++ b/wiki/src/news/report_2011_01-02.mdwn
@@ -142,5 +142,5 @@ A general plan was thought through to reorganize the Tails user
documentation. Once this is done, several entry points will be
available to better fit a given user's available time and energy. In
the meantime, we now at least have a [[nice
-documentation|doc/installing_onto_a_usb_stick/linux]] that explains how
+documentation|doc/first_steps/manual_usb_installation/linux]] that explains how
to install Tails onto a USB stick.
diff --git a/wiki/src/news/report_2011_05-06.mdwn b/wiki/src/news/report_2011_05-06.mdwn
index ecdb11e..dec11ce 100644
--- a/wiki/src/news/report_2011_05-06.mdwn
+++ b/wiki/src/news/report_2011_05-06.mdwn
@@ -34,7 +34,7 @@ Tails developers are not that skilled in documentation writing, so
[[help is needed and much welcome|contribute/how/documentation]]!
Our public email address was renamed to <tails@boum.org>; its [[OpenPGP key|doc/about/openpgp_keys]] was
-updated accordingly. We also have [[documented|doc/trusting_tails_signing_key]]
+updated accordingly. We also have [[documented|doc/get/trusting_tails_signing_key]]
how to get to trust our OpenPGP keys.
GSoC
diff --git a/wiki/src/news/version_0.10.mdwn b/wiki/src/news/version_0.10.mdwn
index 7a63467..76e7e41 100644
--- a/wiki/src/news/version_0.10.mdwn
+++ b/wiki/src/news/version_0.10.mdwn
@@ -57,7 +57,7 @@ Notable user-visible changes include:
* Miscellaneous
- Support booting in "[[Windows XP-like camouflage
- mode|doc/first_steps/windows_theme]]".
+ mode|doc/first_steps/startup_options/windows_camouflage]]".
- Do not fetch APT translation files. Running apt-get update is heavy enough.
- Add MSN support thanks to msn-pecan.
- Add custom SSH client configuration:
diff --git a/wiki/src/security.de.po b/wiki/src/security.de.po
index d708240..c92797b 100644
--- a/wiki/src/security.de.po
+++ b/wiki/src/security.de.po
@@ -79,15 +79,12 @@ msgid "Fixed holes"
msgstr "Behobene Lücken"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "**WARNING**: some of these holes may only be fixed in [[Git]].\n"
-#| "Please carefully read the \"Affected versions\" sections bellow.\n"
+#, no-wrap
msgid ""
"**WARNING**: some of these holes may only be fixed in [[Git|contribute/git]].\n"
"Please carefully read the \"Affected versions\" sections bellow.\n"
msgstr ""
-"**ACHTUNG**: Moeglicherweise sind einige Lücken nur in der [[Git]]-Version behoben.\n"
+"**ACHTUNG**: Moeglicherweise sind einige Lücken nur in der [[Git|contribute/git]]-Version behoben.\n"
"Bitte lesen Sie sorgfältig die den Abschnitt \"Betroffene Versionen\" durch.\n"
#. type: Plain text
diff --git a/wiki/src/security.fr.po b/wiki/src/security.fr.po
index 61fb314..730bc0d 100644
--- a/wiki/src/security.fr.po
+++ b/wiki/src/security.fr.po
@@ -78,16 +78,13 @@ msgid "Fixed holes"
msgstr "Problèmes corrigés"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "**WARNING**: some of these holes may only be fixed in [[Git]].\n"
-#| "Please carefully read the \"Affected versions\" sections bellow.\n"
+#, no-wrap
msgid ""
"**WARNING**: some of these holes may only be fixed in [[Git|contribute/git]].\n"
"Please carefully read the \"Affected versions\" sections bellow.\n"
msgstr ""
"**ATTENTION** : certains de ces problèmes sont peut-être corrigés uniquement\n"
-"dans le dépôt [[Git]].\n"
+"dans le dépôt [[Git|contribute/git]].\n"
"Lisez attentivement les paragraphes \"Versions affectées\"."
#. type: Plain text
diff --git a/wiki/src/security/ineffective_firewall-level_Tor_enforcement.fr.po b/wiki/src/security/ineffective_firewall-level_Tor_enforcement.fr.po
index 48029be..5dd1618 100644
--- a/wiki/src/security/ineffective_firewall-level_Tor_enforcement.fr.po
+++ b/wiki/src/security/ineffective_firewall-level_Tor_enforcement.fr.po
@@ -98,12 +98,10 @@ msgid "Solution"
msgstr "Solution"
#. type: Plain text
-#, fuzzy
-#| msgid "This problem has been fixed in [[Git]] commit 9c425e8de13e6b4f885."
msgid ""
"This problem has been fixed in [[Git|contribute/git]] commit "
"9c425e8de13e6b4f885."
-msgstr "The problème a été résolu dans le commit [[Git]] 9c425e8de13e6b4f885."
+msgstr "The problème a été résolu dans le commit [[Git|contribute/git]] 9c425e8de13e6b4f885."
#. type: Title #
#, no-wrap
diff --git a/wiki/src/sidebar.de.po b/wiki/src/sidebar.de.po
index 1c45597..01c3d92 100644
--- a/wiki/src/sidebar.de.po
+++ b/wiki/src/sidebar.de.po
@@ -57,5 +57,5 @@ msgstr "[[Mitmachen|Contribute]]"
#~ msgid "[[Support]]"
#~ msgstr "[[Support]]"
-#~ msgid "[[Found a problem?|found a problem]]"
-#~ msgstr "[[Probleme?|found a problem]]"
+#~ msgid "[[Found a problem?|support/found a problem]]"
+#~ msgstr "[[Probleme?|support/found a problem]]"
diff --git a/wiki/src/support/found_a_problem.de.po b/wiki/src/support/found_a_problem.de.po
index f9c3824..daf5aa0 100644
--- a/wiki/src/support/found_a_problem.de.po
+++ b/wiki/src/support/found_a_problem.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-19 16:05+0100\n"
+"POT-Creation-Date: 2012-04-14 23:46+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"
@@ -31,14 +31,14 @@ msgstr ""
#. type: Content of: <div><div><p>
#, fuzzy
#| msgid ""
-#| "To begin with, make sure you are using the latest version, as [[upgrading|"
-#| "upgrade]] might solve your problem. If it does not, please read on."
+#| "To begin with, make sure you are using the latest version, as upgrading "
+#| "might solve your problem. If it does not, please read on."
msgid ""
-"To begin with, make sure you are using the latest version, as [[upgrading|doc/"
-"upgrade]] might solve your problem. If it does not, please read on."
+"To begin with, make sure you are using the latest version, as upgrading "
+"might solve your problem. If it does not, please read on."
msgstr ""
-"Zuerst solltest du sicher gehen, die neueste Version zu verwenden. [[Ein "
-"Upgrade|upgrade]] könnte dein Problem lösen. Wenn nicht, dann lies bitte "
+"Zuerst solltest du sicher gehen, die neueste Version zu verwenden. Ein "
+"Upgrade könnte dein Problem lösen. Wenn nicht, dann lies bitte "
"weiter."
#. type: Content of: <div><div><div><h1>
@@ -48,12 +48,12 @@ msgstr "Du hast einen Bug entdeckt?"
#. type: Content of: <div><div><div>
msgid ""
"If you've found a bug in <em>The Amnesic Incognito Live System</em>, please "
-"read the [[bug reporting guidelines|doc/first_steps/report_a_bug]] and post "
+"read the [[bug reporting guidelines|doc/first_steps/bug_reporting]] and post "
"about it on [[the bugs page|bugs]]."
msgstr ""
"Wenn du einen Bug in <em>Tails</em> gefunden hast, dann lies bitte die "
-"[[Bugreport-Richtlinien|doc/first_steps/report_a_bug]] und beschreibe den von "
-"dir entdeckten Fehler auf der [[Bugreport-Seite|bugs]]."
+"[[Bugreport-Richtlinien|doc/first_steps/bug_reporting]] und beschreibe den "
+"von dir entdeckten Fehler auf der [[Bugreport-Seite|bugs]]."
#. type: Content of: <div><div><div><h1>
msgid "Need a new feature?"
@@ -61,11 +61,11 @@ msgstr "Du wünschst dir ein neues Feature?"
#. type: Content of: <div><div><div>
msgid ""
-"If you would like to see a new feature in <em>Tails</em>, [[tell us about it!|"
-"wishlist]]."
+"If you would like to see a new feature in <em>Tails</em>, [[tell us about "
+"it!|wishlist]]."
msgstr ""
-"Wenn du ein bestimmtes Feature in <em>Tails</em> vermisst, dann [[erzähle uns "
-"davon!|wishlist]]."
+"Wenn du ein bestimmtes Feature in <em>Tails</em> vermisst, dann [[erzähle "
+"uns davon!|wishlist]]."
#. type: Content of: <div><div><h1>
msgid "Talk"
diff --git a/wiki/src/support/found_a_problem.es.po b/wiki/src/support/found_a_problem.es.po
index 0674594..870c8d0 100644
--- a/wiki/src/support/found_a_problem.es.po
+++ b/wiki/src/support/found_a_problem.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-19 16:05+0100\n"
+"POT-Creation-Date: 2012-04-14 23:46+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"
@@ -30,11 +30,12 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"To begin with, make sure you are using the latest version, as [[upgrading|doc/"
-"upgrade]] might solve your problem. If it does not, please read on."
+"To begin with, make sure you are using the latest version, as [[upgrading|"
+"doc/upgrade]] might solve your problem. If it does not, please read on."
msgstr ""
-"Para empezar, asegúrate de que estás usando la última versión de Tails, ya que [[actualizarlo|doc/"
-"upgrade]] podría resolver tu problema. Si el problema persiste, sigue leyendo."
+"Para empezar, asegúrate de que estás usando la última versión de Tails, ya "
+"que [[actualizarlo|doc/upgrade]] podría resolver tu problema. Si el problema "
+"persiste, sigue leyendo."
#. type: Content of: <div><div><div><h1>
msgid "Found a bug?"
@@ -43,12 +44,12 @@ msgstr "¿Un error?"
#. type: Content of: <div><div><div>
msgid ""
"If you've found a bug in <em>The Amnesic Incognito Live System</em>, please "
-"read the [[bug reporting guidelines|doc/first_steps/report_a_bug]] and post "
+"read the [[bug reporting guidelines|doc/first_steps/bug_reporting]] and post "
"about it on [[the bugs page|bugs]]."
msgstr ""
-"Si has encontrado un error en <em>The Amnesic Incognito Live System</em>, por favor "
-"lee las [[instrucciones de reporte de errores|doc/first_steps/report_a_bug]] y redacta "
-"sobre él en la [[página de errores|bugs]]."
+"Si has encontrado un error en <em>The Amnesic Incognito Live System</em>, "
+"por favor lee las [[instrucciones de reporte de errores|doc/first_steps/"
+"bug_reporting]] y redacta sobre él en la [[página de errores|bugs]]."
#. type: Content of: <div><div><div><h1>
msgid "Need a new feature?"
@@ -56,11 +57,11 @@ msgstr "¿Nueva funcionalidad?"
#. type: Content of: <div><div><div>
msgid ""
-"If you would like to see a new feature in <em>Tails</em>, [[tell us about it!|"
-"wishlist]]."
+"If you would like to see a new feature in <em>Tails</em>, [[tell us about "
+"it!|wishlist]]."
msgstr ""
-"Si te gustaría ver una nueva funcionalidad en <em>Tails</em>, [[¡háblanos sobre ella!|"
-"wishlist]]."
+"Si te gustaría ver una nueva funcionalidad en <em>Tails</em>, [[¡háblanos "
+"sobre ella!|wishlist]]."
#. type: Content of: <div><div><h1>
msgid "Talk"
diff --git a/wiki/src/support/found_a_problem.fr.po b/wiki/src/support/found_a_problem.fr.po
index 335f349..5103413 100644
--- a/wiki/src/support/found_a_problem.fr.po
+++ b/wiki/src/support/found_a_problem.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-19 16:05+0100\n"
+"POT-Creation-Date: 2012-04-14 23:46+0300\n"
"PO-Revision-Date: 2010-11-02 19:57+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,15 +30,15 @@ msgstr ""
#. type: Content of: <div><div><p>
#, fuzzy
#| msgid ""
-#| "To begin with, make sure you are using the latest version, as [[upgrading|"
-#| "upgrade]] might solve your problem. If it does not, please read on."
+#| "To begin with, make sure you are using the latest version, as upgrading "
+#| "might solve your problem. If it does not, please read on."
msgid ""
-"To begin with, make sure you are using the latest version, as [[upgrading|doc/"
-"upgrade]] might solve your problem. If it does not, please read on."
+"To begin with, make sure you are using the latest version, as upgrading "
+"might solve your problem. If it does not, please read on."
msgstr ""
-"Pour commencer, assurez-vous que vous utilisez la dernière version : [[mettre "
-"à\n"
-"jour|upgrade]] règlerait peut-être votre problème. Si le problème persiste,\n"
+"Pour commencer, assurez-vous que vous utilisez la dernière version : "
+"mettre à\n"
+"jour règlerait peut-être votre problème. Si le problème persiste,\n"
"lisez la suite."
#. type: Content of: <div><div><div><h1>
@@ -48,12 +48,13 @@ msgstr "Un problème ?"
#. type: Content of: <div><div><div>
msgid ""
"If you've found a bug in <em>The Amnesic Incognito Live System</em>, please "
-"read the [[bug reporting guidelines|doc/first_steps/report_a_bug]] and post "
+"read the [[bug reporting guidelines|doc/first_steps/bug_reporting]] and post "
"about it on [[the bugs page|bugs]]."
msgstr ""
"Si vous trouvez un bug dans <em>Tails</em>, merci de lire comment "
"[[rapporter\n"
-"un problème|doc/first_steps/report_a_bug]] puis l'écrire sur la page [[bugs]]."
+"un problème|doc/first_steps/bug_reporting]] puis l'écrire sur la page "
+"[[bugs]]."
#. type: Content of: <div><div><div><h1>
msgid "Need a new feature?"
@@ -61,8 +62,8 @@ msgstr "Besoin d'une fonctionnalité ?"
#. type: Content of: <div><div><div>
msgid ""
-"If you would like to see a new feature in <em>Tails</em>, [[tell us about it!|"
-"wishlist]]."
+"If you would like to see a new feature in <em>Tails</em>, [[tell us about "
+"it!|wishlist]]."
msgstr ""
"Si vous désirez disposer d'une nouvelle fonctionnalité dans <em>Tails</em>,\n"
"[[dites-le nous|wishlist]]. "
diff --git a/wiki/src/support/found_a_problem.html b/wiki/src/support/found_a_problem.html
index c2fecce..642c8ae 100644
--- a/wiki/src/support/found_a_problem.html
+++ b/wiki/src/support/found_a_problem.html
@@ -19,7 +19,7 @@ please read on.</p>
<h1>Found a bug?</h1>
If you've found a bug in <em>The Amnesic Incognito Live System</em>, please
- read the [[bug reporting guidelines|doc/first_steps/report_a_bug]] and post about it on [[the
+ read the [[bug reporting guidelines|doc/first_steps/bug_reporting]] and post about it on [[the
bugs page|bugs]].
</div> <!-- #bugs -->
diff --git a/wiki/src/todo/adapt_documentation_from_Incognito.mdwn b/wiki/src/todo/adapt_documentation_from_Incognito.mdwn
index cec5661..913e196 100644
--- a/wiki/src/todo/adapt_documentation_from_Incognito.mdwn
+++ b/wiki/src/todo/adapt_documentation_from_Incognito.mdwn
@@ -1,7 +1,7 @@
The
[Incognito's
documentation](https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/share/incognito/)
-has [[been imported|doc/walkthrough]].
+has been imported.
We now need to adapt it. This work have started in the `doc-rework` branch, in
which the walkthrough is migrated into Tails doc/ section. Out-of-sync sections
diff --git a/wiki/src/todo/documentation_translation.mdwn b/wiki/src/todo/documentation_translation.mdwn
index c745d1c..f6c18c2 100644
--- a/wiki/src/todo/documentation_translation.mdwn
+++ b/wiki/src/todo/documentation_translation.mdwn
@@ -14,8 +14,8 @@ January 2012
------------
- [[/doc/encryption_and_privacy/secure_deletion/]]
-- [[/doc/first_steps/bridge_mode/]]
-- [[/doc/first_steps/windows_theme/]]
+- [[/doc/first_steps/startup_options/bridge_mode]]
+- [[/doc/first_steps/startup_options/windows_camouflage]]
- [[/doc/encryption_and_privacy/openpgp_passphrase_encryption/]]
- [[/doc/encryption_and_privacy/openpgp_with_gedit/]]
- [[/doc/encryption_and_privacy/secure_deletion/]]
@@ -26,7 +26,7 @@ November 2011
-------------
- [[/doc/about/trust/]]
-- [[/doc/first_steps/report_a_bug/]]
+- [[/doc/first_steps/bug_reporting]]
- [[/doc/encryption_and_privacy/encrypted_volumes/]]
June 2011
@@ -37,8 +37,8 @@ June 2011
- [[/about/]]
- [[/getting_started/]]
- [[/doc/about/warning/]]
-- [[/doc/installing_onto_a_usb_stick/linux/]]
-- [[/doc/installing_onto_a_usb_stick/windows/]]
+- [[manual_usb_installation/linux|/doc/first_steps/manual_usb_installation/linux]]
+- [[manual_usb_installation/windows|/doc/first_steps/manual_usb_installation/windows]]
Will change at some point
=========================
diff --git a/wiki/src/todo/usb_install_and_upgrade.mdwn b/wiki/src/todo/usb_install_and_upgrade.mdwn
index 1bd175c..60ec2ae 100644
--- a/wiki/src/todo/usb_install_and_upgrade.mdwn
+++ b/wiki/src/todo/usb_install_and_upgrade.mdwn
@@ -7,7 +7,7 @@ Current state of things
Tails [[ships hybrid ISO images|contribute/design/hybrid_ISO]]. dd'ing
such a file to a USB stick produces a bootable Tails system and is
-[[well documented|doc/installing_onto_a_usb_stick/linux]], but it
+[[well documented|doc/first_steps/manual_usb_installation/linux]], but it
requires unfriendly command-line usage and overwrites any previously
existing partition table.
diff --git a/wiki/src/todo/usb_install_and_upgrade/todo.mdwn b/wiki/src/todo/usb_install_and_upgrade/todo.mdwn
index d02d1de..a661f84 100644
--- a/wiki/src/todo/usb_install_and_upgrade/todo.mdwn
+++ b/wiki/src/todo/usb_install_and_upgrade/todo.mdwn
@@ -111,7 +111,7 @@ Later
Windows support?
----------------
-As [[documented already|doc/installing_onto_a_usb_stick/windows]],
+As [[documented already|doc/first_steps/manual_usb_installation/windows]],
the basic Tails install onto a USB stick from Windows is already easy
to do.
diff --git a/wiki/src/todo/vpn_support.mdwn b/wiki/src/todo/vpn_support.mdwn
index fbdaeb3..7bb7393 100644
--- a/wiki/src/todo/vpn_support.mdwn
+++ b/wiki/src/todo/vpn_support.mdwn
@@ -41,7 +41,7 @@ Unlike the other VPN setup yhis would be trivial to implement.
* Access Tor on networks where it's blocked. Using a bridge is
preferable when possible, and should always be possible once
- [[todo/todo/obsfproxy]] is mature and in wide use. Until then this
+ [[todo/obsfproxy]] is mature and in wide use. Until then this
may be an acceptible workaround.
* Some ISPs require their customers to connect to them through VPNs,
especially PPTP. Tails is currently unusable for them out of the