Small fixes from victory

48 files changed, 63 insertions, 92 deletions

diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index e38306c4a..9715d3535 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -318,6 +318,9 @@
 <!ENTITY url-ibm-powerkvm
  "https://www.ibm.com/developerworks/linux/tutorials/l-ibm-powerkvm-system-bring-up/">
 
+<!ENTITY url-ibm-fixcentral
+ "https://www.ibm.com/support/fixcentral/">
+
 <!-- ****************************************** mips links -->
 
 <!ENTITY url-linux-mips "http://www.linux-mips.org/">
diff --git a/ca/boot-installer/x86.xml b/ca/boot-installer/x86.xml
index 1d1aba5e2..c4fdb097b 100644
--- a/ca/boot-installer/x86.xml
+++ b/ca/boot-installer/x86.xml
@@ -355,7 +355,7 @@ Quan arrenqui l'instal·lador us apareixerà una pantalla gràfica
 amigable mostrant el logotip de &debian; i un menú:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Install
 Graphical install
diff --git a/cs/boot-installer/x86.xml b/cs/boot-installer/x86.xml
index 2a5dbcca4..a03a085a3 100644
--- a/cs/boot-installer/x86.xml
+++ b/cs/boot-installer/x86.xml
@@ -310,7 +310,7 @@ Při zavádění instalačního programu se objeví grafická obrazovka
 s logem &debian;u a nabídkou:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Graphical install
 Install
diff --git a/de/boot-installer/x86.xml b/de/boot-installer/x86.xml
index 33035f680..a879617f8 100644
--- a/de/boot-installer/x86.xml
+++ b/de/boot-installer/x86.xml
@@ -318,7 +318,7 @@ Wenn der Installer startet, sollte Ihnen ein hübscher grafischer Bildschirm
 angezeigt werden mit dem &debian;-Logo und einem Menü:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Graphical install
 Install
diff --git a/de/preparing/bios-setup/powerpc.xml b/de/preparing/bios-setup/powerpc.xml
index ea2ad396c..b9f6eccc2 100644
--- a/de/preparing/bios-setup/powerpc.xml
+++ b/de/preparing/bios-setup/powerpc.xml
@@ -104,7 +104,7 @@ Führen Sie für das Firmware-Update folgende Schritte aus:
 <orderedlist>
 <listitem><para>
     Sichern Sie die existierende Firmware, bevor Sie aktualisieren.
-    In ASM, dem Systemmenü, klicken Sie <command>Service Aids ??? 
+    In ASM, dem Systemmenü, klicken Sie <command>Service Aids -&gt; 
     Service Processor Command Line</command> und führen folgenden
     Befehl aus:
 <informalexample><screen>
diff --git a/debian/changelog b/debian/changelog
index 688e14939..4ca8cc467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ installation-guide (20160630) UNRELEASED; urgency=medium
   * Document text frontend shortcuts.
   * Document passing option in the x86 UEFI case.
 
+  [ victory ]
+  * Small fixes.
+
  -- Karsten Merker <merker@debian.org>  Wed, 29 Jun 2016 12:09:38 +0200
 
 installation-guide (20160629) unstable; urgency=medium
diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 784995dac..f0293948c 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -91,9 +91,9 @@
       Run a serial console at 115200, 8bit no parity, and boot the
       Juno. It should boot from the USB stick to a GRUB menu.
       The console config is not correctly detected on Juno so just hitting
-      return will show no kernel output. Set the console to  
+      &enterkey; will show no kernel output. Set the console to  
 <informalexample><screen>console=ttyAMA0,115200n8</screen></informalexample>
-      as described in (<xref linkend="arm64-console-setup"/>). <keycombo><keycap>Control</keycap>
+      (as described in <xref linkend="arm64-console-setup"/>). <keycombo><keycap>Control</keycap>
 <keycap>x</keycap></keycombo> to boot should show you the &d-i; screens,
       and allow you to proceed with a standard installation.
     </para>
@@ -180,7 +180,7 @@ printenv kernel_addr_r ramdisk_addr_r fdt_addr_r
         systems based on Allwinner SunXi SOCs (e.g.  the Allwinner A10,
         architecture name <quote>sun4i</quote> or the Allwinner A20,
         architecture name <quote>sun7i</quote>), you can e.g.  use the
-        follwing values:
+        following values:
 <informalexample><screen>
 setenv kernel_addr_r 0x46000000
 setenv fdt_addr_r 0x47000000
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index fcda0fa41..0c5024e30 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -308,7 +308,7 @@ When the installer boots, you should be presented with a friendly graphical
 screen showing the &debian; logo and a menu:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Graphical install
 Install
diff --git a/en/preparing/bios-setup/powerpc.xml b/en/preparing/bios-setup/powerpc.xml
index 58db25d1d..f03f3d23c 100644
--- a/en/preparing/bios-setup/powerpc.xml
+++ b/en/preparing/bios-setup/powerpc.xml
@@ -96,14 +96,15 @@ Perform the following steps for the update:
 <orderedlist>
 <listitem><para>
     Save the level of the existing firmware before really updating. In
-    ASM, in the system menu, click <command>Service Aids ??? Service Processor
+    ASM, in the system menu, click <command>Service Aids -&gt; Service Processor
     Command Line</command>, and run the following command:
 <informalexample><screen>
      cupdcmd -f
 </screen></informalexample>
 </para></listitem><listitem><para>
     Download the .img file of the level of firmware to be updated to a
-    location in the host filesystem. Refer to IBM Fix Central for downloading
+    location in the host filesystem. Refer to
+    <ulink url="&url-ibm-fixcentral;">IBM Fix Central</ulink> for downloading
     the image file.
 </para><para>
     Verify the image downloaded by running the following command and
diff --git a/it/boot-installer/x86.xml b/it/boot-installer/x86.xml
index f91dfc16f..a9035eec1 100644
--- a/it/boot-installer/x86.xml
+++ b/it/boot-installer/x86.xml
@@ -538,7 +538,7 @@ Quando l'installatore parte viene mostrata una schermata con il logo di
 &debian; e un menu:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Install
 Graphical install
diff --git a/it/preparing/bios-setup/powerpc.xml b/it/preparing/bios-setup/powerpc.xml
index c641f1ff6..e8d7b07a7 100644
--- a/it/preparing/bios-setup/powerpc.xml
+++ b/it/preparing/bios-setup/powerpc.xml
@@ -190,12 +190,12 @@ Per effettuare l'aggiornamento seguire questi passi:
 
 <!--
 Save the level of the existing firmware before really updating. In
-ASM, in the system menu, click <command>Service Aids ??? Service Processor
+ASM, in the system menu, click <command>Service Aids -&gt; Service Processor
 Command Line</command>, and run the following command:
 -->
 
 Salvare la verisone esistente del firmware prima di aggiornarlo. Da
-ASM, nel menu di sistema, fare clic su <command>Service Aids ??? Service
+ASM, nel menu di sistema, fare clic su <command>Service Aids -&gt; Service
 Processor Command Line</command> ed eseguire il seguente comando:
 
 <informalexample><screen>
diff --git a/po/da/boot-installer.po b/po/da/boot-installer.po
index c6684e582..a5de6b274 100644
--- a/po/da/boot-installer.po
+++ b/po/da/boot-installer.po
@@ -1321,7 +1321,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/da/preparing.po b/po/da/preparing.po
index ed1b92a3d..1b1998cd9 100644
--- a/po/da/preparing.po
+++ b/po/da/preparing.po
@@ -1569,7 +1569,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/el/boot-installer.po b/po/el/boot-installer.po
index a125dfea5..a0742b156 100644
--- a/po/el/boot-installer.po
+++ b/po/el/boot-installer.po
@@ -1235,7 +1235,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/el/preparing.po b/po/el/preparing.po
index a5fd5fafa..d89df6b40 100644
--- a/po/el/preparing.po
+++ b/po/el/preparing.po
@@ -2097,7 +2097,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/es/boot-installer.po b/po/es/boot-installer.po
index 6dc3834d0..399bc197d 100644
--- a/po/es/boot-installer.po
+++ b/po/es/boot-installer.po
@@ -1237,7 +1237,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/es/preparing.po b/po/es/preparing.po
index d53b84cdc..ba02c93c0 100644
--- a/po/es/preparing.po
+++ b/po/es/preparing.po
@@ -2083,7 +2083,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/fi/boot-installer.po b/po/fi/boot-installer.po
index 8921393c7..579ec7bc5 100644
--- a/po/fi/boot-installer.po
+++ b/po/fi/boot-installer.po
@@ -1197,7 +1197,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index b57bb3d57..df66d5325 100644
--- a/po/fi/preparing.po
+++ b/po/fi/preparing.po
@@ -1952,7 +1952,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/fr/boot-installer.po b/po/fr/boot-installer.po
index f30123f91..413be3e15 100644
--- a/po/fr/boot-installer.po
+++ b/po/fr/boot-installer.po
@@ -1413,7 +1413,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
@@ -1421,13 +1421,6 @@ msgid ""
 "Help\n"
 "Install with speech synthesis"
 msgstr ""
-"Installer boot menu\n"
-"\n"
-"Install\n"
-"Graphical install\n"
-"Advanced options             >\n"
-"Help\n"
-"Install with speech synthesis"
 
 #. Tag: para
 #: boot-installer.xml:904
diff --git a/po/fr/preparing.po b/po/fr/preparing.po
index e43e6c60b..e00976376 100644
--- a/po/fr/preparing.po
+++ b/po/fr/preparing.po
@@ -2016,11 +2016,11 @@ msgstr "Pour la mise à jour, voici les étapes à effectuer :"
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 "Sauvegardez la version actuelle avant de faire la mise à jour. Dans le menu "
-"system de ASM, cliquez sur <command>Service Aids ??? Service Processor "
+"system de ASM, cliquez sur <command>Service Aids -&gt; Service Processor "
 "Command Line</command> et lancez la commande suivante :"
 
 #. Tag: screen
diff --git a/po/hu/boot-installer.po b/po/hu/boot-installer.po
index 634fe31ed..bfb9626b1 100644
--- a/po/hu/boot-installer.po
+++ b/po/hu/boot-installer.po
@@ -1195,7 +1195,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index 65fcde39a..bad881229 100644
--- a/po/hu/preparing.po
+++ b/po/hu/preparing.po
@@ -1984,7 +1984,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 8d4227825..38e60413b 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -1374,7 +1374,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
@@ -1382,13 +1382,6 @@ msgid ""
 "Help\n"
 "Install with speech synthesis"
 msgstr ""
-"Installer boot menu\n"
-"\n"
-"Graphical install\n"
-"Install\n"
-"Advanced options             >\n"
-"Help\n"
-"Install with speech synthesis"
 
 #. Tag: para
 #: boot-installer.xml:904
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index 442c3ad16..78ae1380a 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -1963,11 +1963,11 @@ msgstr "更新には以下の手順を実行します:"
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 "実際に更新する前に既存レベルのファームウェアを保存します。ASM のシステムメ"
-"ニューから <command>Service Aids → Service Processor Command Line</command> "
+"ニューから <command>Service Aids -&gt; Service Processor Command Line</command> "
 "をクリックし、以下のコマンドを実行します:"
 
 #. Tag: screen
diff --git a/po/ko/boot-installer.po b/po/ko/boot-installer.po
index 60ab3de15..4cfe5bddf 100644
--- a/po/ko/boot-installer.po
+++ b/po/ko/boot-installer.po
@@ -1353,17 +1353,9 @@ msgstr ""
 
 #. Tag: screen
 #: boot-installer.xml:900
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Installer boot menu\n"
-#| "\n"
-#| "Install\n"
-#| "Graphical install\n"
-#| "Advanced options             >\n"
-#| "Help\n"
-#| "Install with speech synthesis"
-msgid ""
-"Installer boot menu\n"
+#, no-c-format
+msgid ""
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
@@ -1371,13 +1363,6 @@ msgid ""
 "Help\n"
 "Install with speech synthesis"
 msgstr ""
-"Installer boot menu\n"
-"\n"
-"Install\n"
-"Graphical install\n"
-"Advanced options             >\n"
-"Help\n"
-"Install with speech synthesis"
 
 #. Tag: para
 #: boot-installer.xml:904
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index b2b2e5606..57ae0a9b2 100644
--- a/po/ko/preparing.po
+++ b/po/ko/preparing.po
@@ -1940,11 +1940,11 @@ msgstr "다음 단계를 통해 업데이트합니다:"
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 "실제 업데이트하기 전에 현재 펌웨어의 단계를 저장합니다. 시스템 메뉴의 ASM에"
-"서 <command>Service Aids ??? Service Processor Command Line</command>를 누르"
+"서 <command>Service Aids -&gt; Service Processor Command Line</command>를 누르"
 "고 다음 명령을 실행합니다:"
 
 #. Tag: screen
diff --git a/po/nl/boot-installer.po b/po/nl/boot-installer.po
index a48810794..026054545 100644
--- a/po/nl/boot-installer.po
+++ b/po/nl/boot-installer.po
@@ -1012,7 +1012,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/nl/preparing.po b/po/nl/preparing.po
index 38302b2ee..72ff8f026 100644
--- a/po/nl/preparing.po
+++ b/po/nl/preparing.po
@@ -1552,7 +1552,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/nn/boot-installer.po b/po/nn/boot-installer.po
index a48810794..026054545 100644
--- a/po/nn/boot-installer.po
+++ b/po/nn/boot-installer.po
@@ -1012,7 +1012,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/nn/preparing.po b/po/nn/preparing.po
index 38302b2ee..72ff8f026 100644
--- a/po/nn/preparing.po
+++ b/po/nn/preparing.po
@@ -1552,7 +1552,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po
index 9e6d5fe1d..9ccf9cf0c 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -1412,7 +1412,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
@@ -1420,13 +1420,6 @@ msgid ""
 "Help\n"
 "Install with speech synthesis"
 msgstr ""
-"Installer boot menu\n"
-"\n"
-"Graphical install\n"
-"Install\n"
-"Advanced options             >\n"
-"Help\n"
-"Install with speech synthesis"
 
 #. Tag: para
 #: boot-installer.xml:904
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index 669b57c2d..e42984f76 100644
--- a/po/pt/preparing.po
+++ b/po/pt/preparing.po
@@ -2028,11 +2028,11 @@ msgstr "Realizar os seguintes passos para a actualização:"
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 "Grave o nível do firmware existente antes de fazer realmente a actualização. "
-"Em ASM, no menu system, click em <command>Service Aids ??? Service Processor "
+"Em ASM, no menu system, click em <command>Service Aids -&gt; Service Processor "
 "Command Line</command>, e corra o seguinte comando:"
 
 #. Tag: screen
diff --git a/po/ro/boot-installer.po b/po/ro/boot-installer.po
index a48810794..026054545 100644
--- a/po/ro/boot-installer.po
+++ b/po/ro/boot-installer.po
@@ -1012,7 +1012,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/ro/preparing.po b/po/ro/preparing.po
index 38302b2ee..72ff8f026 100644
--- a/po/ro/preparing.po
+++ b/po/ro/preparing.po
@@ -1552,7 +1552,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po
index 63e3e74b8..4c4d552e3 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -1322,7 +1322,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 5f6c2fad5..316b09424 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -2019,7 +2019,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/sv/boot-installer.po b/po/sv/boot-installer.po
index 8611b80c8..cca2e1302 100644
--- a/po/sv/boot-installer.po
+++ b/po/sv/boot-installer.po
@@ -1198,7 +1198,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index abd8806f5..fd42ea269 100644
--- a/po/sv/preparing.po
+++ b/po/sv/preparing.po
@@ -1978,7 +1978,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/tl/boot-installer.po b/po/tl/boot-installer.po
index a48810794..026054545 100644
--- a/po/tl/boot-installer.po
+++ b/po/tl/boot-installer.po
@@ -1012,7 +1012,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/tl/preparing.po b/po/tl/preparing.po
index 38302b2ee..72ff8f026 100644
--- a/po/tl/preparing.po
+++ b/po/tl/preparing.po
@@ -1552,7 +1552,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po
index c0c34c1a1..8f9150330 100644
--- a/po/vi/boot-installer.po
+++ b/po/vi/boot-installer.po
@@ -1201,7 +1201,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 736785932..90ec28bf1 100644
--- a/po/vi/preparing.po
+++ b/po/vi/preparing.po
@@ -1954,7 +1954,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index be657a2b7..e609f4633 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1162,7 +1162,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 4e868f135..2cb70cae0 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1885,7 +1885,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po
index 8b3466c7c..795ad0283 100644
--- a/po/zh_TW/boot-installer.po
+++ b/po/zh_TW/boot-installer.po
@@ -1165,7 +1165,7 @@ msgstr ""
 #: boot-installer.xml:900
 #, no-c-format
 msgid ""
-"Installer boot menu\n"
+"&debian-gnu; installer boot menu\n"
 "\n"
 "Graphical install\n"
 "Install\n"
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index 1f4a0fdce..515546c66 100644
--- a/po/zh_TW/preparing.po
+++ b/po/zh_TW/preparing.po
@@ -1799,7 +1799,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Save the level of the existing firmware before really updating. In ASM, in "
-"the system menu, click <command>Service Aids ??? Service Processor Command "
+"the system menu, click <command>Service Aids -&gt; Service Processor Command "
 "Line</command>, and run the following command:"
 msgstr ""
 
diff --git a/pt_BR/boot-installer/x86.xml b/pt_BR/boot-installer/x86.xml
index 188185480..20ac9ca82 100644
--- a/pt_BR/boot-installer/x86.xml
+++ b/pt_BR/boot-installer/x86.xml
@@ -354,7 +354,7 @@ Quando o programa de instalação for iniciado, você deverá ver uma amigável
 tela gráfica mostrando o logotipo do &debian; e um menu:
 
 <informalexample><screen>
-Installer boot menu
+&debian-gnu; installer boot menu
 
 Install
 Graphical install