Fix "boot-new" part for non-Linux ports.

20 files changed, 66 insertions, 66 deletions

diff --git a/ca/boot-new/boot-new.xml b/ca/boot-new/boot-new.xml
index 61aaaafc8..bd2793827 100644
--- a/ca/boot-new/boot-new.xml
+++ b/ca/boot-new/boot-new.xml
@@ -10,11 +10,11 @@
 La primera arrencada del vostre sistema pels seus propis mitjans és el que els
 enginyers electrònics anomenen la <quote>prova de foc</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Si heu realitzat una instal·lació predeterminada, el primer que hauríeu
 de veure en arrencar el sistema és el menú del carregador de l'arrencada
-<classname>grub</classname>, o bé el <classname>lilo</classname>.
+<classname>grub</classname><phrase arch="x86">, o bé el <classname>lilo</classname></phrase>.
 Les primeres opcions al menú seran per al nou sistema Debian. Si es
 detecten altres sistemes operatius durant el procés d'instal·lació
 (com ara Windows), es llistaran en el menú a continuació de les entrades
@@ -32,7 +32,7 @@ els problemes és utilitzar el mode rescat integrat en l'instal·lador
 
 </para><para>
 
-Si sou nou a Debian i Linux, tal vegada necessiteu l'ajuda d'usuaris
+Si sou nou a Debian i &arch-kernel;, tal vegada necessiteu l'ajuda d'usuaris
 més experimentats. <phrase arch="x86">Per a ajuda en línia podeu provar
 els canals d'IRC #debian o #debian-boot a la xarxa OFTC. Alternativament
 podeu preguntar a la <ulink url="&url-list-subscribe;">llista de correu
@@ -46,7 +46,7 @@ També podeu enviar un informe d'instal·lació tal i com es descriu a
 clarament la situació i d'incloure tots els missatges mostrats que
 puguin ser d'ajuda als demés a l'hora de diagnosticar el problema.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Si teníeu altres sistemes operatius instal·lats a la màquina i no
 s'han detectat correctament, envieu també un informe d'instal·lació.
diff --git a/cs/boot-new/boot-new.xml b/cs/boot-new/boot-new.xml
index f48ab38d0..52de05ce0 100644
--- a/cs/boot-new/boot-new.xml
+++ b/cs/boot-new/boot-new.xml
@@ -10,12 +10,12 @@
 
 Teď přichází chvíle <emphasis>zahoření</emphasis> systému.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Jestliže jste provedli víceméně standardní instalaci, měli byste při
 zavádění systému jako první vidět nabídku zavaděče
-<classname>grub</classname>, případně
-<classname>lilo</classname>. První položky nabídky patří novému
+<classname>grub</classname><phrase arch="x86">, případně
+<classname>lilo</classname></phrase>. První položky nabídky patří novému
 systému Debian. Jestliže máte na svém systému i jiné operační systémy
 (např. Windows), které byly během instalace rozpoznány, budou v
 nabídce uvedeny.
@@ -44,7 +44,7 @@ linkend="submit-bug"/>). Svůj problém popište stručně a jasně a opište
 z obrazovky všechny hlášky, které by mohly ostatním pomoci v určení
 problému.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Pokud na svém počítači máte operační systémy, které nebyly nalezeny,
 nebo nebyly rozpoznány správně, pošlete nám prosím zprávu o instalaci.
diff --git a/de/boot-new/boot-new.xml b/de/boot-new/boot-new.xml
index f6a8fdce6..6c35bafa9 100644
--- a/de/boot-new/boot-new.xml
+++ b/de/boot-new/boot-new.xml
@@ -10,11 +10,11 @@
 Der erste Systemstart aus eigener Kraft ist das, was Elektroingenieure
 den <quote>smoke test</quote> nennen (testen ob's qualmt).
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Wenn Sie eine Standard-Installation durchgeführt haben, sollten Sie als erstes
-das Menü des Bootloaders <classname>grub</classname> oder eventuell
-<classname>lilo</classname> sehen, wenn Sie booten. Der erste Auswahlpunkt
+das Menü des Bootloaders <classname>grub</classname><phrase arch="x86"> oder eventuell
+<classname>lilo</classname> sehen</phrase>, wenn Sie booten. Der erste Auswahlpunkt
 in dem Menü ist Ihr neues Debian-System. Falls Sie weitere Betriebssysteme auf
 dem Rechner installiert haben (wie z.B. Windows), die vom Installationssystem
 erkannt wurden, sind diese weiter unten im Menü aufgelistet.
@@ -31,7 +31,7 @@ ist die Benutzung des eingebauten Rettungs-Modus' des Installers (siehe
 
 </para><para>
 
-Wenn Sie noch neu sind bei Debian und Linux, benötigen Sie vielleicht Hilfe
+Wenn Sie noch neu sind bei Debian und &arch-kernel;, benötigen Sie vielleicht Hilfe
 von erfahreneren Benutzern. <phrase arch="x86">Direkte Online-Hilfe bekommen
 Sie vielleicht auf den IRC-Channels #debian oder #debian-boot im OFTC-Netzwerk.
 Alternativ können Sie die <ulink url="&url-list-subscribe;">debian-user
@@ -45,7 +45,7 @@ Sie können auch einen Installationsbericht einschicken, wie im
 klar und verständlich zu beschreiben und etwaige (Fehler-)Meldungen mit
 anzugeben, die anderen helfen könnten, das Problem zu diagnostizieren.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Falls Sie ein weiteres Betriebssystem auf Ihrem Computer installiert haben, dieses
 aber nicht oder nicht korrekt erkannt wurde, senden Sie uns bitte ebenfalls einen
diff --git a/debian/changelog b/debian/changelog
index 49e381f2b..f65126aa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
     people.
   * Fix "boot-installer" part for non-Linux ports. Still needs extensive
     review from BSD people.
-  * Fix "preparing", "using-d-i" parts for non-Linux ports.
+  * Fix "preparing", "using-d-i", "boot-new" parts for non-Linux ports.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml
index 8b295b00b..cb16d2fcc 100644
--- a/en/boot-new/boot-new.xml
+++ b/en/boot-new/boot-new.xml
@@ -10,11 +10,11 @@
 Your system's first boot on its own power is what electrical engineers
 call the <quote>smoke test</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 If you did a default installation, the first thing you should see when you
-boot the system is the menu of the <classname>grub</classname> or possibly
-the <classname>lilo</classname> bootloader.
+boot the system is the menu of the <classname>grub</classname><phrase arch="x86"> or possibly
+the <classname>lilo</classname> bootloader</phrase>.
 The first choices in the menu will be for your new Debian system. If you
 had any other operating systems on your computer (like Windows) that were
 detected by the installation system, those will be listed lower down in the
@@ -31,7 +31,7 @@ built-in rescue mode (see <xref linkend="rescue"/>).
 
 </para><para>
 
-If you are new to Debian and Linux, you may need some help from more
+If you are new to Debian and &arch-kernel;, you may need some help from more
 experienced users.
 <phrase arch="x86">For direct on-line help you can try the IRC channels
 #debian or #debian-boot on the OFTC network. Alternatively you can contact
@@ -45,7 +45,7 @@ You can also file an installation report as described in
 clearly and include any messages that are displayed and may help others to
 diagnose the issue.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 If you had any other operating systems on your computer that were not detected
 or not detected correctly, please file an installation report.
diff --git a/es/boot-new/boot-new.xml b/es/boot-new/boot-new.xml
index 41625ef9f..ec663f6dc 100644
--- a/es/boot-new/boot-new.xml
+++ b/es/boot-new/boot-new.xml
@@ -13,10 +13,10 @@
 El primer arranque aut�nomo de su sistema es lo que los ingenieros
 el�ctricos llaman <quote>la prueba de humo</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Lo primero que deber�a ver cuando arranque el sistema es el men� del cargador
-de arranque <classname>grub</classname> o <classname>lilo</classname> si ha
+de arranque <classname>grub</classname><phrase arch="x86"> o <classname>lilo</classname></phrase> si ha
 hecho la instalaci�n por omisi�n.  Las primeras opciones en el men� ser�n las
 de su nuevo sistema Debian. Se listar�n m�s abajo otros sistemas operativos en
 su sistema (como Windows) si los ten�a y los detect� el sistema de instalaci�n.
@@ -33,7 +33,7 @@ linkend="rescue"/>).
  
 </para><para>
 Es posible que necesite ayuda de usuarios m�s experimentados si es
-nuevo a Debian y a Linux.
+nuevo a Debian y a &arch-kernel;.
 <phrase arch="x86">Puede intentar obtener ayuda directamente en l�nea en
 los canales de IRC #debian o #debian-boot en la red OFTC.
 Tambi�n puede contactar la <ulink url="&url-list-subscribe;">lista de
@@ -48,7 +48,7 @@ en <xref linkend="submit-bug"/>. Por favor, aseg�rese de que describe
 claramente su problema y de que incluye cualquier mensaje que se
 muestra de forma que otros puedan diagnosticar el problema.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Si ten�a alg�n sistema operativo en su ordenador que no se detect� o
 se detect� incorrectamente, por favor, env�e un informe de
diff --git a/fr/boot-new/boot-new.xml b/fr/boot-new/boot-new.xml
index a94eb427b..6cda2b683 100644
--- a/fr/boot-new/boot-new.xml
+++ b/fr/boot-new/boot-new.xml
@@ -10,10 +10,10 @@ Voici ce que les ingénieurs en électronique appellent le
 <emphasis>test de la fumée</emphasis>&nbsp;: démarrer un système pour la 
 première fois.
 </para>
-<para arch="x86">
+<para arch="any-x86">
 Après une installation standard, le premier écran que vous verrez au démarrage
 du système est le menu du programme d'amorçage <classname>grub</classname>
-ou celui de <classname>lilo</classname>. Le premier choix est votre nouveau
+<phrase arch="x86">ou celui de <classname>lilo</classname></phrase>. Le premier choix est votre nouveau
 système Debian. Si d'autres systèmes (comme Windows) ont été détectés, ils seront affichés
 au dessous.
 </para>
@@ -26,7 +26,7 @@ intégré à l'installateur (voyez <xref linkend="rescue"/>).
 </para>
 
 <para>
-Si vous découvrez Debian et Linux, vous aurez besoin de l'aide d'utilisateurs
+Si vous découvrez Debian et &arch-kernel;, vous aurez besoin de l'aide d'utilisateurs
 expérimentés.
 <phrase arch="x86">Les canaux IRC #debian ou #debian-boot sur le réseau OFTC apportent
 une aide directe. Vous pouvez aussi contacter la
@@ -38,7 +38,7 @@ Vous pouvez aussi envoyer un rapport d'installation, voyez <xref linkend="submit
 Assurez-vous de bien décrire votre problème et d'inclure tous les messages qui
 sont affichés. Cela peut aider à diagnostiquer le problème.
 </para>
-<para arch="x86">
+<para arch="any-x86">
 Veuillez envoyer un rapport d'installation si des systèmes d'exploitation installés sur
 la machine n'ont pas été détectés ou ont été mal détectés.
 </para>
diff --git a/it/boot-new/boot-new.xml b/it/boot-new/boot-new.xml
index 71ae1aba4..3c0d28edc 100644
--- a/it/boot-new/boot-new.xml
+++ b/it/boot-new/boot-new.xml
@@ -19,7 +19,7 @@ call the <quote>smoke test</quote>.
 Il primo avvio del sistema a piena potenza è ciò che gli ingegneri
 elettronici chiamano la <quote>prova del fumo</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 <!--
 If you did a default installation, the first thing you should see when you
@@ -33,7 +33,7 @@ menu.
 
 Nel caso sia stata effettuata una installazione predefinita, la prima
 cosa che viene mostrata all'avvio del sistema è il menu di
-<classname>grub</classname> o forse quello di <classname>lilo</classname>.
+<classname>grub</classname><phrase arch="x86"> o forse quello di <classname>lilo</classname></phrase>.
 Alla prima voce nel menu corrisponde il nuovo sistema Debian; se durante
 l'installazione è stata rilevata la presenza sul sistema anche di altri
 sistemi (per esempio Windows) allora quest'altri sistemi operativi sono
@@ -61,7 +61,7 @@ d'installazione (si veda <xref linkend="rescue"/>).
 </para><para>
 
 <!--
-If you are new to Debian and Linux, you may need some help from more
+If you are new to Debian and &arch-kernel;, you may need some help from more
 experienced users.
 <phrase arch="x86">For direct on-line help you can try the IRC channels
 #debian or #debian-boot on the OFTC network. Alternatively you can contact
@@ -76,7 +76,7 @@ clearly and include any messages that are displayed and may help others to
 diagnose the issue.
 -->
 
-Gli utenti che non conoscono Debian e Linux potrebbero aver bisogno di
+Gli utenti che non conoscono Debian e &arch-kernel; potrebbero aver bisogno di
 aiuto da parte degli utenti più esperti.
 <phrase arch="x86">Si può ricevere un'aiuto on-line sui canali IRC
 #debian o #debian-boot della rete OFTC oppure contattando la
@@ -89,7 +89,7 @@ indicazioni in <xref linkend="submit-bug"/>, si raccomanda di descrivere il
 problema in modo chiaro e di riportare qualsiasi messaggio visualizzato
 poiché potrebbe essere utile per la diagnosi del problema.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 <!--
 If you had any other operating systems on your computer that were not detected
diff --git a/nl/boot-new/boot-new.xml b/nl/boot-new/boot-new.xml
index 0c6552be0..a46269c95 100644
--- a/nl/boot-new/boot-new.xml
+++ b/nl/boot-new/boot-new.xml
@@ -9,10 +9,10 @@
 De eerste keer dat u uw computer opnieuw opstart met uw nieuwe Debian
 systeem is een soort <quote>vuurdoop</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Als u een standaard installatie heeft uitgevoerd, is het menu van de
-<classname>grub</classname>, of eventueel van de <classname>lilo</classname>
+<classname>grub</classname><phrase arch="x86">, of eventueel van de <classname>lilo</classname></phrase>
 opstartlader, het eerste dat u behoort te zien nadat het systeem opnieuw
 opstart.
 De eerste keuzes in het menu zullen betrekking hebben op uw nieuwe Debian
@@ -30,7 +30,7 @@ reddingsmodus van het installatiesysteem (zie <xref linkend="rescue"/>).
 
 </para><para>
 
-Als Debian en Linux nieuw zijn voor u, dan kunt u hierbij mogelijk wat hulp
+Als Debian en &arch-kernel; nieuw zijn voor u, dan kunt u hierbij mogelijk wat hulp
 gebruiken van meer ervaren gebruikers.
 <phrase arch="x86">Voor directe on-line hulp kunt u de IRC-kanalen #debian of
 #debian-boot op het OFTC-netwerk proberen. Of anders kunt u een bericht sturen
@@ -43,7 +43,7 @@ beschreven in <xref linkend="submit-bug"/>. Probeer daarbij uw probeem helder
 te omschrijven en neem in het verslag op eventuele getoonde berichten die
 anderen kunnen helpen het probleem te diagnosticeren.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Als er andere besturingssystemen op uw computer aanwezig waren die niet
 gedetecteerd, of niet correct gedetecteerd werden, stuur ons dan een
diff --git a/po/el/boot-new.po b/po/el/boot-new.po
index 4894aaf6f..d22195ef6 100644
--- a/po/el/boot-new.po
+++ b/po/el/boot-new.po
@@ -86,7 +86,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -98,7 +98,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Αν είσαστε καινούριοι στο Debian και το Linux, πιθανόν να χρειαστείτε "
+"Αν είσαστε καινούριοι στο Debian και το &arch-kernel;, πιθανόν να χρειαστείτε "
 "βοήθεια από πιο έμπειρους χρήστες.  <phrase arch=\"x86\"> Για άμεση βοήθεια "
 "από το δίκτυο μπορείτε να δοκιμάσετε τα κανάλια IRC #debian ή #debian-boot "
 "στο δίκτυο OFTC. Εναλλακτικά μπορείτε να απευθυνθείτε στην  <ulink url="
diff --git a/po/fi/boot-new.po b/po/fi/boot-new.po
index cd60462ee..76d4f2b41 100644
--- a/po/fi/boot-new.po
+++ b/po/fi/boot-new.po
@@ -74,7 +74,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -86,7 +86,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Jos Debian ja Linux ovat uusia sinulle, saatat tarvita kokeneempien "
+"Jos Debian ja &arch-kernel; ovat uusia sinulle, saatat tarvita kokeneempien "
 "käyttäjien tukea. <phrase arch=\"x86\">Suoraan tietoverkosta apua löytyy IRC-"
 "kanavilta #debian ja #debian-boot IRC-verkossa OFTC. Toinen tapa on käyttää "
 "<ulink url=\"&url-list-subscribe;\">debian-user-sähköpostilistaa</ulink>.</"
diff --git a/po/hu/boot-new.po b/po/hu/boot-new.po
index c4ed8f433..29507f355 100644
--- a/po/hu/boot-new.po
+++ b/po/hu/boot-new.po
@@ -75,7 +75,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -87,7 +87,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Ha új vagy a Debian és Linux világában, vígadhatsz régi motorosokkal. "
+"Ha új vagy a Debian és &arch-kernel; világában, vígadhatsz régi motorosokkal. "
 "<phrase arch=\"x86\">A közvetlen nemzetközi segítséget a #debian vagy "
 "#debian-boot IRC csatornán kapod az OFTC hálózaton. A <ulink url=\"&url-list-"
 "subscribe;\">Debian levelező listákon</ulink> saját néped nagy Debian "
diff --git a/po/ja/boot-new.po b/po/ja/boot-new.po
index 3544b55aa..797cc61a4 100644
--- a/po/ja/boot-new.po
+++ b/po/ja/boot-new.po
@@ -76,7 +76,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -88,7 +88,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"もし Debian や Linux に不馴れなら、より経験のあるユーザの手助けが必要かもしれ"
+"もし Debian や &arch-kernel; に不馴れなら、より経験のあるユーザの手助けが必要かもしれ"
 "ません。<phrase arch=\"x86\">直接的なオンラインヘルプとして、OFTC ネットワー"
 "ク上の IRC チャネル (#debian あるいは #debian-boot) を試してみてください。あ"
 "るいは、<ulink url=\"&url-list-subscribe;\">debian-user メーリングリスト</"
diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po
index d1169f305..63fbda35a 100644
--- a/po/pt/boot-new.po
+++ b/po/pt/boot-new.po
@@ -42,15 +42,15 @@ msgstr ""
 #, no-c-format
 msgid ""
 "If you did a default installation, the first thing you should see when you "
-"boot the system is the menu of the <classname>grub</classname> or possibly "
-"the <classname>lilo</classname> bootloader. The first choices in the menu "
+"boot the system is the menu of the <classname>grub</classname><phrase arch=\"x86\"> or possibly "
+"the <classname>lilo</classname> bootloader</phrase>. The first choices in the menu "
 "will be for your new Debian system. If you had any other operating systems "
 "on your computer (like Windows) that were detected by the installation "
 "system, those will be listed lower down in the menu."
 msgstr ""
 "Se fez uma instalação por omissão, a primeira coisa que deve ver quando "
 "arrancar o sistema é o menu do gestor de arranque <classname>grub</"
-"classname> ou possivelmente do <classname>lilo</classname>. As primeiras "
+"classname><phrase arch=\"x86\"> ou possivelmente do <classname>lilo</classname></phrase>. As primeiras "
 "escolhas do menu serão para arrancar o seu novo sistema Debian. Se tiver "
 "outros sistemas operativos no seu computador (como o Windows) que tenham "
 "sido detectados pelo sistema de instalação, esses serão listados abaixo no "
@@ -79,7 +79,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -91,7 +91,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Se é novo em Debian e Linux, pode necessitar de alguma ajuda de utilizadores "
+"Se é novo em Debian e &arch-kernel;, pode necessitar de alguma ajuda de utilizadores "
 "mais experientes. <phrase arch=\"x86\">Para ajuda directa online pode tentar "
 "os canais de IRC #debian e #debian-boot na rede OFTC. Em alternativa pode "
 "contactar a <ulink url=\"&url-list-subscribe;\">mailing list debian-user</"
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index 75ae9a388..156c94de8 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -79,7 +79,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -91,7 +91,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Если вы новичок в Debian и Linux, вам может потребоваться помощь более "
+"Если вы новичок в Debian и &arch-kernel;, вам может потребоваться помощь более "
 "опытных пользователей. <phrase arch=\"x86\">Чтобы получить помощь быстро, вы "
 "можете попробовать воспользоваться IRC каналами #debian или #debian-boot "
 "сети OFTC. Или же вы можете написать в<ulink url=\"&url-list-subscribe;\">в "
diff --git a/po/sv/boot-new.po b/po/sv/boot-new.po
index 3413d2890..4f477b356 100644
--- a/po/sv/boot-new.po
+++ b/po/sv/boot-new.po
@@ -41,15 +41,15 @@ msgstr ""
 #, no-c-format
 msgid ""
 "If you did a default installation, the first thing you should see when you "
-"boot the system is the menu of the <classname>grub</classname> or possibly "
-"the <classname>lilo</classname> bootloader. The first choices in the menu "
+"boot the system is the menu of the <classname>grub</classname><phrase arch=\"x86\"> or possibly "
+"the <classname>lilo</classname> bootloader</phrase>. The first choices in the menu "
 "will be for your new Debian system. If you had any other operating systems "
 "on your computer (like Windows) that were detected by the installation "
 "system, those will be listed lower down in the menu."
 msgstr ""
 "Om du gjorde en standardinstallation, är det första du kommer att se när du "
-"startar upp systemet, menyn för starthanteraren <classname>grub</classname> "
-"eller möjligen <classname>lilo</classname>. De första valen i menyn kommer "
+"startar upp systemet, menyn för starthanteraren <classname>grub</classname><phrase arch=\"x86\"> "
+"eller möjligen <classname>lilo</classname></phrase>. De första valen i menyn kommer "
 "att vara för ditt nya Debian-system. Om du hade några andra operativsystem "
 "på din dator (som Windows) som identifierades av installationssystemet, "
 "kommer dessa att listas längre ner i menyn."
@@ -77,7 +77,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -89,7 +89,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Om du är nybörjare när det gäller Debian och Linux, kanske du behöver lite "
+"Om du är nybörjare när det gäller Debian och &arch-kernel;, kanske du behöver lite "
 "hjälp från mer erfarna användare. <phrase arch=\"x86\">För direkthjälp på "
 "Internet kan du prova IRC-kanalerna #debian eller #debian-boot på OFTC-"
 "nätverket. Alternativt kan du kontakta <ulink url=\"&url-list-subscribe;"
diff --git a/po/vi/boot-new.po b/po/vi/boot-new.po
index d488c07fb..37a3256f9 100644
--- a/po/vi/boot-new.po
+++ b/po/vi/boot-new.po
@@ -78,7 +78,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -90,7 +90,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Nếu bạn chưa quen với Debian và Linux, có lẽ bạn cần có sự giúp đỡ của những "
+"Nếu bạn chưa quen với Debian và &arch-kernel;, có lẽ bạn cần có sự giúp đỡ của những "
 "người dùng kinh nghiệm. <phrase arch=\"x86\">Để được trợ giúp trực tuyến "
 "trực tiếp, hãy vào kênh IRC <classname>#debian</classname> hay "
 "<classname>#debian-boot</classname> trên mạng OFTC. Hoặc bạn có thể đăng ký "
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index b9512ab2e..2c2428812 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -68,7 +68,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
@@ -80,7 +80,7 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"假如您刚接触 Debian 和 Linux，您可能需要从有经验的用户那里得到一些帮助。"
+"假如您刚接触 Debian 和 &arch-kernel;，您可能需要从有经验的用户那里得到一些帮助。"
 "<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian 或 "
 "#debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;"
 "\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于"
diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po
index c885625aa..8eb2841ab 100644
--- a/po/zh_TW/boot-new.po
+++ b/po/zh_TW/boot-new.po
@@ -60,7 +60,7 @@ msgstr ""
 #: boot-new.xml:32
 #, no-c-format
 msgid ""
-"If you are new to Debian and Linux, you may need some help from more "
+"If you are new to Debian and &arch-kernel;, you may need some help from more "
 "experienced users. <phrase arch=\"x86\">For direct on-line help you can try "
 "the IRC channels #debian or #debian-boot on the OFTC network. Alternatively "
 "you can contact the <ulink url=\"&url-list-subscribe;\">debian-user mailing "
diff --git a/pt_BR/boot-new/boot-new.xml b/pt_BR/boot-new/boot-new.xml
index 4563a4e58..bc7c58224 100644
--- a/pt_BR/boot-new/boot-new.xml
+++ b/pt_BR/boot-new/boot-new.xml
@@ -12,11 +12,11 @@
 A primeira inicialização do seu sistema é o que os engenheiros elétricos
 chamam de <quote>teste de fumaça</quote>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Se você fez a instalação padrão, a primeira coisa que você deveria ver quando
 inicializar o sistema é o menu do carregador de inicialização
-<classname>grub</classname> ou possivelmente do  <classname>lilo</classname>.
+<classname>grub</classname><phrase arch="x86"> ou possivelmente do  <classname>lilo</classname></phrase>.
 As primeiras opções do menu serão para o seu novo sistema Debian. Se você
 possui quaisquer outros sistemas operacionais no seu computador (como o
 Windows) que foram detectados pelo sistema de instalação, eles estarão listados
@@ -34,7 +34,7 @@ usar o modo de recuperação que já vem com o instalador (veja
 
 </para><para>
 
-Se você é novo no Debian e no Linux, você pode precisar de algumas ajuda de
+Se você é novo no Debian e no &arch-kernel;, você pode precisar de algumas ajuda de
 usuários mais experientes.
 <phrase arch="x86">Para ajuda <quote>on-line</quote> direta você pode tentar
 os canais de IRC #debian ou #debian-boot (em ambos fala-se inglês) ou o
@@ -52,7 +52,7 @@ Você também pode enviar um relatório de instalação conforme descrito em
 seu problema claramente e inclui quaisquer mensagem que são exibidas e que
 podem ajudar outros a diagnosticar o problema.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Se você tinha quaisquer outros sistemas operacionais em seu computador que
 não foram detectados ou não foram detectados corretamente, por favor, envie