Rename download_2 into download

And get rid of the 'dave_2' file names.

wiki/src/.htaccess

@@ -27,7 +27,7 @@ RewriteRule ^doc/installing_onto_a_usb_stick/windows install/win/usb/overview [R
 RewriteRule ^doc/installing_onto_a_usb_stick/mac install/mac/usb/overview [R]
 RewriteRule ^doc/first_steps/bridge_mode doc/first_steps/startup_options/bridge_mode [R]
 RewriteRule ^doc/first_steps/windows_theme doc/first_steps/startup_options/windows_camouflage [R]
-RewriteRule ^doc/trusting_tails_signing_key install/download_2#openpgp [R,NE]
+RewriteRule ^doc/trusting_tails_signing_key install/download#openpgp [R,NE]
 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]
 RewriteRule ^doc/encryption_and_privacy/openpgp_passphrase_encryption doc/encryption_and_privacy/gpgapplet/passphrase_encryption [R]
@@ -56,10 +56,10 @@ RewriteRule ^doc/first_steps/installation/manual install [R]
 RewriteRule ^doc/first_steps/installation/manual/linux install/linux/usb/overview [R]
 RewriteRule ^doc/first_steps/installation/manual/mac install/mac/usb/overview [R]
 RewriteRule ^doc/first_steps/installation/manual/windows install/win/usb/overview [R]
-RewriteRule ^doc/get/trusting_tails_signing_key install/download_2#openpgp [R,NE]
-RewriteRule ^doc/get/verify_the_iso_image_using_gnome install/download_2#openpgp [R]
-RewriteRule ^doc/get/verify_the_iso_image_using_other_operating_systems install/download_2#openpgp [R]
-RewriteRule ^doc/get/verify_the_iso_image_using_the_command_line install/download_2#openpgp [R]
+RewriteRule ^doc/get/trusting_tails_signing_key install/download#openpgp [R,NE]
+RewriteRule ^doc/get/verify_the_iso_image_using_gnome install/download#openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_other_operating_systems install/download#openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_the_command_line install/download#openpgp [R]
 RewriteRule ^doc/first_steps/bug_reporting/tails_does_not_start doc/first_steps/bug_reporting#does_not_start [R,NE]
 RewriteRule ^todo contribute/working_together/Redmine [R]
 RewriteRule ^wishlist contribute/working_together/Redmine [R]
@@ -75,7 +75,7 @@ RewriteRule ^install/win/clone/overview install/win/clone-overview [R]
 RewriteRule ^install/win/usb/overview install/win/usb-overview [R]
 RewriteRule ^upgrade/clone/overview upgrade/clone-overview [R]
 RewriteRule ^upgrade/tails/overview upgrade/tails-overview [R]
-RewriteRule ^install/download/openpgp install/download_2#openpgp [R,NE]
+RewriteRule ^install/download/openpgp install/download#openpgp [R,NE]
 RewriteRule ^install/vm doc/advanced_topics/virtualization [R]
 
 # Legacy tickets URLs

wiki/src/contribute/l10n_tricks/core_po_files.txt

@@ -47,7 +47,7 @@
 ./install/debian/usb
 ./install/debian/usb-overview
 ./install/debian/usb-download
-./install/download_2
+./install/download
 ./install/dvd
 ./install/dvd-download
 ./install/expert/usb
@@ -59,7 +59,7 @@
 ./install/inc/router/why_two.inline
 ./install/inc/steps/create_persistence.inline
 ./install/inc/steps/debian_requirements.inline
-./install/inc/steps/download_2.inline
+./install/inc/steps/download.inline
 ./install/inc/steps/install_final.inline
 ./install/inc/steps/install_intermediary_intro.inline
 ./install/inc/steps/install_intermediary_outro.inline

wiki/src/install/debian/usb-download.de.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/debian/usb-download.fa.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/debian/usb-download.fr.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/debian/usb-download.it.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/debian/usb-download.mdwn

@@ -2,9 +2,9 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave_2"]]
+[[!meta script="install/inc/js/download"]]
 
-[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]

wiki/src/install/debian/usb-download.pt.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/download.de.po

@@ -34,7 +34,7 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"styleshee
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
 
 #. type: Plain text
@@ -50,11 +50,11 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"style
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"

wiki/src/install/download.fa.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/download.fr.po

@@ -34,7 +34,7 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"styleshee
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
 
 #. type: Plain text
@@ -50,11 +50,11 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"style
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"

wiki/src/install/download.it.po

@@ -35,7 +35,7 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"styleshee
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
 
 #. type: Plain text
@@ -51,11 +51,11 @@ msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"style
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/download.inline.it\" raw=\"yes\" sort=\"age\"]]\n"

wiki/src/install/download.mdwn

@@ -2,9 +2,9 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave_2"]]
+[[!meta script="install/inc/js/download"]]
 
-[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]

wiki/src/install/download.pt.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/download_2.de.po

@@ -21,21 +21,21 @@ msgid ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+"download.inline\" raw=\"yes\" sort=\"age\"]]"
 msgstr ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline.de\" raw=\"yes\" sort=\"age\"]]"
+"download.inline.de\" raw=\"yes\" sort=\"age\"]]"

wiki/src/install/download_2.fa.po

@@ -21,21 +21,21 @@ msgid ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+"download.inline\" raw=\"yes\" sort=\"age\"]]"
 msgstr ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline.fa\" raw=\"yes\" sort=\"age\"]]"
+"download.inline.fa\" raw=\"yes\" sort=\"age\"]]"

wiki/src/install/download_2.fr.po

@@ -21,21 +21,21 @@ msgid ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+"download.inline\" raw=\"yes\" sort=\"age\"]]"
 msgstr ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline.fr\" raw=\"yes\" sort=\"age\"]]"
+"download.inline.fr\" raw=\"yes\" sort=\"age\"]]"

wiki/src/install/download_2.html

@@ -2,10 +2,10 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave_2"]]
+[[!meta script="install/inc/js/download"]]
 [[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
 
-[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]

wiki/src/install/download_2.it.po

@@ -21,21 +21,21 @@ msgid ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+"download.inline\" raw=\"yes\" sort=\"age\"]]"
 msgstr ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline.it\" raw=\"yes\" sort=\"age\"]]"
+"download.inline.it\" raw=\"yes\" sort=\"age\"]]"

wiki/src/install/download_2.pt.po

@@ -21,21 +21,21 @@ msgid ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+"download.inline\" raw=\"yes\" sort=\"age\"]]"
 msgstr ""
 "[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
 "rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
 "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
 "\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
 "stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
+"title=\"\"]] [[!meta script=\"install/inc/js/download\"]] [[!meta link="
 "\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
 "\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline.pt\" raw=\"yes\" sort=\"age\"]]"
+"download.inline.pt\" raw=\"yes\" sort=\"age\"]]"

wiki/src/install/dvd-download.de.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/dvd-download.fa.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/dvd-download.fr.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/dvd-download.it.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/dvd-download.mdwn

@@ -2,9 +2,9 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/dvd" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave_2"]]
+[[!meta script="install/inc/js/download"]]
 
-[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]

wiki/src/install/dvd-download.pt.po

@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -48,10 +48,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave_2\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""

wiki/src/install/expert/usb.de.po

@@ -118,7 +118,7 @@ msgstr ""
 msgid ""
 "This verification technique uses the OpenPGP Web of Trust and the "
 "certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
 msgstr ""
 "Diese Methode zur Verifizierung benutzt das OpenPGP Web of Trust und die von "
 "offiziellen Debian-Entwicklern vorgenommenen Zertifizierungen über den "

wiki/src/install/expert/usb.fa.po

@@ -97,7 +97,7 @@ msgstr ""
 msgid ""
 "This verification technique uses the OpenPGP Web of Trust and the "
 "certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
 msgstr ""
 
 #. type: Bullet: '1. '

wiki/src/install/expert/usb.fr.po

@@ -113,7 +113,7 @@ msgstr ""
 msgid ""
 "This verification technique uses the OpenPGP Web of Trust and the "
 "certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
 msgstr ""
 "Cette méthode de vérification utilise la toile de confiance OpenPGP et les "
 "certifications faites par des développeurs Debian officiels à la clé de "

wiki/src/install/expert/usb.it.po

@@ -113,7 +113,7 @@ msgstr ""
 msgid ""
 "This verification technique uses the OpenPGP Web of Trust and the "
 "certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
 msgstr ""
 "Questa tecnica di verifica usa la Web of Trust OpenPGP e la certificazione "
 "fatta da sviluppatori Debian ufficiali sulla chiave di firma Tails. [[Impara "

wiki/src/install/expert/usb.mdwn

@@ -36,7 +36,7 @@ OpenPGP Keys</a> by <em>Riseup</em>.</p>
 This verification technique uses the OpenPGP Web of Trust and the
 certification made by official Debian developers on the Tails signing
 key. [[Learn more about the OpenPGP Web of
-Trust|install/download_2#openpgp]].
+Trust|install/download#openpgp]].
 
 1. Import the Tails signing key in your <span class="application">GnuPG</span> keyring:
 

wiki/src/install/expert/usb.pt.po

@@ -97,7 +97,7 @@ msgstr ""
 msgid ""
 "This verification technique uses the OpenPGP Web of Trust and the "
 "certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
 msgstr ""
 
 #. type: Bullet: '1. '

wiki/src/install/inc/steps/download_2.inline.de.po → wiki/src/install/inc/steps/download.inline.de.po

@@ -1094,13 +1094,13 @@ msgstr ""