Commit 8657a6d1 authored by sajolida's avatar sajolida
Browse files

Write 'Boot Loader' consistently

parent a938d826
......@@ -43,6 +43,12 @@
computer or when writing for a technical audience, like in our
design documentation.
- Use *Boot Loader* when referring to either *GRUB* or *SYSLINUX*.
- *For example:*
- The Boot Loader is the first screen that appears when starting Tails.
- Use *boot* when referring to *boot options*, which are only
documented for workarounds or a technical audience.
......@@ -57,10 +63,10 @@
boot option in the <span class="application">Boot Loader
Menu</span>. For detailed instructions, see the documentation on
[[using the <span class="application">Boot Loader
Menu</span>|doc/first_steps/startup_options#boot_loader_menu]].
Menu</span>|doc/first_steps/startup_options#boot-loader]].
- To make the display work properly, [[add the following boot option
when starting Tails|doc/first_steps/startup_options/#boot_loader_menu]]:
when starting Tails|doc/first_steps/startup_options/#boot-loader]]:
nouveau.noaccel=1
......
......@@ -5,7 +5,8 @@ functioning. The two ways of specifying startup options are the following:
[[!toc levels=2]]
<a id="boot_loader_menu"></a>
<a id="boot-loader"></a>
<a id="boot_loader_menu"></a> <!-- for backward compatibility -->
<a id="boot_menu"></a> <!-- for backward compatibility -->
Using the Boot Loader
......@@ -36,7 +37,7 @@ This is how *SYSLINUX* looks like:
[[!img install/inc/screenshots/syslinux.png link="no" alt="Black screen ('SYSLINUX') with Tails
logo and 2 options: 'Tails' and 'Tails (Troubleshooting Mode)'."]]
If your boot loader looks differently, refer to our instructions on
If your Boot Loader looks differently, refer to our instructions on
adding a boot option [[using GRUB|startup_options#grub]] below.
To add a boot option in *SYSLINUX*:
......@@ -67,7 +68,7 @@ This is how GRUB looks like:
[[!img install/inc/screenshots/grub.png link="no" alt="Black screen ('GNU GRUB') with Tails
logo and 2 options: 'Tails' and 'Tails (Troubleshooting Mode)'."]]
If your boot loader looks differently, refer to our instructions on
If your Boot Loader looks differently, refer to our instructions on
adding a boot option [[using SYSLINUX|startup_options#syslinux]] above.
To add a boot option in *GRUB*:
......@@ -98,7 +99,7 @@ Using <span class="application">Tails Greeter</span>
====================================================
<span class="application">Tails Greeter</span>
appears after the <span class="application">Boot Loader Menu</span>, but before the
appears after the <span class="application">Boot Loader</span>, but before the
<span class="application">GNOME Desktop</span>:
[[!img tails-greeter-welcome-to-tails.png link=no alt="Tails Greeter: Welcome to Tails!"]]
......
......@@ -165,7 +165,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -163,7 +163,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -194,13 +194,13 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"Fügen Sie beim Start von Tails die <span class=\"command\">toram</span> "
"Bootoption im <span class=\"application\">Bootmenü</span> hinzu. Für "
"detaillierte Anweisungen lesen Sie bitte die Dokumentation\n"
"zum [[<span class=\"application\">Bootmenü</span>|"
"startup_options#boot_loader_menu]]."
"startup_options#boot-loader]]."
#. type: Bullet: '2. '
msgid ""
......
......@@ -194,13 +194,13 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"Cuando inicies Tails, añade la opción de arranque <span class=\"command"
"\">toram</span> en el <span class=\"application\">Menú de Gestión de "
"Arranque</span>. Para instrucciones detalladas, lee la documentación sobre "
"como [[usar el <span class=\"application\">Menú de Gestión de Arranque</"
"span>|startup_options#boot_loader_menu]]."
"span>|startup_options#boot-loader]]."
#. type: Bullet: '2. '
msgid ""
......
......@@ -225,7 +225,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"هنگام راه‌اندازی تیلز گزینهٔ بوت <span class=\"command\">toram</span> را در "
"<span class=\"application\">فهرست بوت</span> اضافه کنید. برای خواندن راهنمای "
......
......@@ -196,13 +196,13 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"Au démarrage de Tails, ajoutez <span class=\"command\">toram</span> comme "
"option de démarrage dans le <span class=\"application\">menu du chargeur "
"d’amorçage</span>. Pour des instructions détaillées, voir la documentation "
"sur [[l'utilisation du <span class=\"application\">menu du chargeur "
"d’amorçage</span>|startup_options#boot_loader_menu]]."
"d’amorçage</span>|startup_options#boot-loader]]."
#. type: Bullet: '2. '
msgid ""
......
......@@ -161,7 +161,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -243,7 +243,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"Quando Tails è partito, aggiungi l'opzione di avvio <span class=\"command"
"\">toram</span> nel<span class=\"application\">menù di avvio</span>. Per "
......
......@@ -66,9 +66,9 @@ If Tails is your only Linux system, you can generally reset a Tails USB stick
directly from that USB stick while running Tails.
1. When starting Tails, add the <span class="command">toram</span> boot
option in the <span class="application">Boot Loader Menu</span>. For detailed
option in the <span class="application">Boot Loader</span>. For detailed
instructions, see the documentation on [[using the <span
class="application">Boot Loader Menu</span>|startup_options#boot_loader_menu]].
class="application">Boot Loader</span>|startup_options#boot-loader]].
2. If Tails starts as usual, follow the instructions for [[resetting a USB stick
using <span class="application">GNOME Disks</span>|linux#disks]].
......
......@@ -164,7 +164,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -227,7 +227,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
"Quando iniciar o Tails, adicione a opção de boot <span class=\"command"
"\">toram</span> no <span class=\"application\">meno de boot</span>. Para "
......
......@@ -164,7 +164,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -167,7 +167,7 @@ msgid ""
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span "
"class=\"application\">Boot Loader "
"Menu</span>|startup_options#boot_loader_menu]]."
"Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -163,7 +163,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -165,7 +165,7 @@ msgid ""
"When starting Tails, add the <span class=\"command\">toram</span> boot "
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span class="
"\"application\">Boot Loader Menu</span>|startup_options#boot_loader_menu]]."
"\"application\">Boot Loader Menu</span>|startup_options#boot-loader]]."
msgstr ""
#. type: Bullet: '2. '
......
......@@ -183,7 +183,7 @@ msgid ""
"option in the <span class=\"application\">Boot Loader Menu</span>. For "
"detailed instructions, see the documentation on [[using the <span "
"class=\"application\">Boot Loader "
"Menu</span>|startup_options#boot_loader_menu]]."
"Menu</span>|startup_options#boot-loader]]."
msgstr ""
"在啟動Tails 時,新增 <span class=\"command\">toram</span> 開機選項在 <span class=\""
"application\">開機載入選單Boot Loader Menu</span>。 詳細的指示,請參見[[<span class=\""
......
......@@ -45,17 +45,17 @@
<li>
<p>If the computer starts on Tails, the <span class="application">Boot Loader Menu</span>
<p>If the computer starts on Tails, the Boot Loader
appears and Tails starts automatically after 4 seconds.</p>
<p>[[!img install/inc/screenshots/boot_loader_menu.png link="no" alt="Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'."]]</p>
<p>[[!img install/inc/screenshots/boot_loader_menu.png link="no" alt="Black screen with Tails artwork. Boot Loader with two options 'Tails' and 'Tails (Troubleshooting Mode)'."]]</p>
</li>
</ol>
<div class="bug">
<p>If your computer displays the <span class="application">Boot Loader Menu</span>
<p>If your computer displays the Boot Loader
but then fails to start on the USB stick, it might
currently be impossible to start Tails on your Mac model.</p>
<p>Please [[!toggle id="report-toggle" text="report the problem to our help desk"]].</p>
......
......@@ -13,13 +13,13 @@ But, it is very hard to know without trying.</li>
</ul>
<p>The goal is to reach the <span class="application">Boot Loader
Menu</span> of Tails:</p>
</span> of Tails:</p>
<p>[[!img install/inc/screenshots/boot_loader_menu.png link="no" alt="Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'."]]</p>
<div class="next">
<p>After you reach the <span class="application">Boot Loader Menu</span>, you
<p>After you reach the Boot Loader, you
can skip the rest of this section and <a href="#greeter">wait until
<span class="application">Tails Greeter</span> appears</a>.</p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment