Reword a few "Linux" occurrences in "Using the Debian Installer"

30 files changed, 94 insertions, 92 deletions

diff --git a/ca/using-d-i/modules/base-installer.xml b/ca/using-d-i/modules/base-installer.xml
index 6917db5c3..f9fb67c7d 100644
--- a/ca/using-d-i/modules/base-installer.xml
+++ b/ca/using-d-i/modules/base-installer.xml
@@ -19,7 +19,7 @@ sèrie.
 
 </para><para>
 
-Com a part de la instal·lació, s'instal·larà un nucli del Linux. A la prioritat
+Com a part de la instal·lació, s'instal·larà un nucli del &arch-kernel;. A la prioritat
 per defecte, l'instal·lador elegirà aquell que es correspongui millor amb el
 maquinari. En modes de prioritat més baixa, podreu elegir a partir d'una
 llista dels nuclis disponibles.
diff --git a/ca/using-d-i/using-d-i.xml b/ca/using-d-i/using-d-i.xml
index 16e7907c6..1f9fdc4d5 100644
--- a/ca/using-d-i/using-d-i.xml
+++ b/ca/using-d-i/using-d-i.xml
@@ -318,7 +318,7 @@ IDE (pseudomaquinari) que es troben a les plaques bases més noves.
 <term>base-installer</term><listitem><para>
 
 Instal·la el conjunt de paquets més bàsics que permetin a l'ordinador
-funcionar sota Linux quan es reiniciï.
+funcionar sota &debian; quan es reiniciï.
 
 </para></listitem>
 </varlistentry>
@@ -367,7 +367,7 @@ iniciar.
 
 Cadascun dels instal·ladors de carregadors d'arrencada instal·la
 un programa al disc dur, que és necessari perquè l'ordinador pugui
-arrencar el Linux sense utilitzar un disquet o CD-ROM. Molts carregadors
+arrencar el &arch-kernel; sense utilitzar un disquet o CD-ROM. Molts carregadors
 d'arrencada permeten a l'usuari triar un sistema operatiu alternatiu
 cada vegada que s'arrenca l'ordinador.
 
diff --git a/de/using-d-i/modules/base-installer.xml b/de/using-d-i/modules/base-installer.xml
index b7bc5c3a2..8e1ff4a36 100644
--- a/de/using-d-i/modules/base-installer.xml
+++ b/de/using-d-i/modules/base-installer.xml
@@ -20,7 +20,7 @@ erfolgt.
 
 </para><para>
 
-Als Teil der Installation wird ein Linux-Kernel installiert. In der
+Als Teil der Installation wird ein &arch-kernel;-Kernel installiert. In der
 Standard-Prioritätseinstellung
 wählt der Installer einen für Sie aus, der am besten zu Ihrer Hardware passt.
 Bei niedrigeren Prioritätseinstellungen können Sie selbst aus einer Liste
diff --git a/de/using-d-i/using-d-i.xml b/de/using-d-i/using-d-i.xml
index 1e4b4777c..3ef2c5cbb 100644
--- a/de/using-d-i/using-d-i.xml
+++ b/de/using-d-i/using-d-i.xml
@@ -325,7 +325,7 @@ neueren Motherboards finden, für gewöhnlich überlegen.
 <term>base-installer (Basissystem installieren)</term><listitem><para>
 
 Installiert die grundlegendsten Pakete, die dem Computer nach dem
-Neustart den Betrieb unter Linux ermöglichen.
+Neustart den Betrieb unter &debian; ermöglichen.
 
 </para></listitem>
 </varlistentry>
diff --git a/debian/changelog b/debian/changelog
index e7c0aaf89..49e381f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,9 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Fix port URL for non-Linux ports.
   * Fix "hardware" part for non-Linux ports. Now needs fine-tune from BSD
     people.
-  * Fix "preparing" and "boot-installer" part for non-Linux ports.
+  * 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.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/using-d-i/modules/base-installer.xml b/en/using-d-i/modules/base-installer.xml
index 483064ff1..f04f36d2f 100644
--- a/en/using-d-i/modules/base-installer.xml
+++ b/en/using-d-i/modules/base-installer.xml
@@ -18,7 +18,7 @@ installation is performed over a serial console.
 
 </para><para>
 
-As part of the installation, a Linux kernel will be installed. At the default
+As part of the installation, a &arch-kernel; kernel will be installed. At the default
 priority, the installer will choose one for you that best matches your
 hardware. In lower priority modes, you will be able to choose from a list
 of available kernels.
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index b14f50a95..eb4ed7a0a 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -315,7 +315,7 @@ newer motherboards.
 <term>base-installer</term><listitem><para>
 
 Installs the most basic set of packages which would allow
-the computer to operate under Linux when rebooted.
+the computer to operate under &debian; when rebooted.
 
 </para></listitem>
 </varlistentry>
@@ -361,7 +361,7 @@ which operating system to start.
 <term>bootloader-installer</term><listitem><para>
 
 The various bootloader installers each install a boot loader program on the
-hard disk, which is necessary for the computer to start up using Linux
+hard disk, which is necessary for the computer to start up using &arch-kernel;
 without using a floppy or CD-ROM.  Many boot loaders allow the user to
 choose an alternate operating system each time the computer boots.
 
diff --git a/es/using-d-i/modules/base-installer.xml b/es/using-d-i/modules/base-installer.xml
index 1a23279b7..ea50c797b 100644
--- a/es/using-d-i/modules/base-installer.xml
+++ b/es/using-d-i/modules/base-installer.xml
@@ -20,7 +20,7 @@ de que la instalaci�n se realice a trav�s de una consola serie.
 
 </para><para>
 
-Se instalar� un n�cleo de Linux como parte de la instalaci�n. En la prioridad
+Se instalar� un n�cleo de &arch-kernel; como parte de la instalaci�n. En la prioridad
 predeterminada, el instalador elegir� por usted el que mejor se adapte a su
 hardware. En los modos de menor prioridad, podr� elegir uno entre una lista de
 n�cleos disponibles.
diff --git a/es/using-d-i/using-d-i.xml b/es/using-d-i/using-d-i.xml
index a21f02eeb..f921754cd 100644
--- a/es/using-d-i/using-d-i.xml
+++ b/es/using-d-i/using-d-i.xml
@@ -334,7 +334,7 @@ software habitualmente es mejor que los controladores baratos RAID IDE
 <term>base-installer</term><listitem><para>
 
 Instala el conjunto de paquetes m�s b�sico que permitir� que el
-ordenador opere con Linux cuando se reinicie.
+ordenador opere con &debian; cuando se reinicie.
 
 </para></listitem>
 </varlistentry>
@@ -385,7 +385,7 @@ operativo iniciar en el momento de arrancar su sistema.
 
 Los distintos instaladores del gestor de arranque instalan un programa
 de gesti�n de arranque en el disco duro. �ste es necesario
-para que el ordenador arranque usando Linux sin usar un disco flexible
+para que el ordenador arranque usando &arch-kernel; sin usar un disco flexible
 � CD-ROM. Muchos gestores de arranque permiten al usuario elegir un
 sistema operativo alternativo cada vez que el ordenador se reinicia.
 
diff --git a/eu/using-d-i/modules/base-installer.xml b/eu/using-d-i/modules/base-installer.xml
index 579d3049e..58a41ede9 100644
--- a/eu/using-d-i/modules/base-installer.xml
+++ b/eu/using-d-i/modules/base-installer.xml
@@ -23,7 +23,7 @@ instalazioa kontsola serial baten bidez egiterakoan.
 
 </para><para>
 
-Instalazioaren zati bezala Linux kernel bat instalatua izango da. Lehenetsi
+Instalazioaren zati bezala &arch-kernel; kernel bat instalatua izango da. Lehenetsi
 bezala instalatzaileak zure hardwareak behar duen bat instalatuko du. 
 Baina hala nahi izan ezkero lehentasun txikia erabiliaz eskuragarri
 dauden kernelen artean aukera dezakezu.
diff --git a/eu/using-d-i/using-d-i.xml b/eu/using-d-i/using-d-i.xml
index 5e336b27d..1c507f7d7 100644
--- a/eu/using-d-i/using-d-i.xml
+++ b/eu/using-d-i/using-d-i.xml
@@ -223,7 +223,7 @@ RAID kontrolatzaileak baino hobea izan ohi da.
 </varlistentry>
 <varlistentry>
 <term>base-installer</term><listitem><para>
-Berrabiaraztean konputagailuak Linuxpean lan egin
+Berrabiaraztean konputagailuak &debian; lan egin
 dezan ahalbidetzen duen oinarrizko pakete multzo bat
 instalatzen du. 
 </para></listitem>
@@ -246,7 +246,7 @@ asko hautatuko du abioan zein sistema eragilerekin hasi nahi duen.
 <varlistentry>
 <term>bootloader-installer</term><listitem><para>
 Abiarazketa kudeatzeko programa bat instalatzen du diska gogorrean,
-CD-ROM edo 3.5eko diskarik erabili gabe Linux erabiltzeko beharrezkoa
+CD-ROM edo 3.5eko diskarik erabili gabe &arch-kernel; erabiltzeko beharrezkoa
 dena. Abiarazketa kudeatzaile askok erabiltzaileari saioa beste sistema
 eragile batekin hasteko aukera ematen diote abiarazketa bakoitzean.
 </para></listitem>
diff --git a/fr/using-d-i/modules/base-installer.xml b/fr/using-d-i/modules/base-installer.xml
index 67e931935..06b9f16d4 100644
--- a/fr/using-d-i/modules/base-installer.xml
+++ b/fr/using-d-i/modules/base-installer.xml
@@ -19,7 +19,7 @@ quand l'installation se fait avec une console série.
 
 </para>
 <para>
-Le noyau Linux fait partie de l'installation. Avec la priorité par défaut,
+Le noyau &arch-kernel; fait partie de l'installation. Avec la priorité par défaut,
 l'installateur choisira le noyau qui correspond le mieux à votre matériel.
 Avec les priorités les plus basses, vous pourrez en choisir un dans une liste.
 </para>
@@ -40,4 +40,4 @@ les paquets installés pendant le processus d'installation du système de
 base ne sont pas installés. La règle décrite précédemment n'est
 appliquée qu'après l'installation du système de base.
 
-</para></note>
\ No newline at end of file
+</para></note>
diff --git a/fr/using-d-i/using-d-i.xml b/fr/using-d-i/using-d-i.xml
index f8617f2f0..28d419058 100644
--- a/fr/using-d-i/using-d-i.xml
+++ b/fr/using-d-i/using-d-i.xml
@@ -310,7 +310,7 @@ supérieur à celui des contrôleurs IDE qu'on trouve sur les cartes mère réce
 <term>base-installer</term><listitem><para>
 
 Ce programme installe l'ensemble des programmes de base qui permettront
-le fonctionnement de l'ordinateur sous Linux après le redémarrage.
+le fonctionnement de l'ordinateur sous &debian; après le redémarrage.
 
 </para></listitem>
 </varlistentry>
@@ -358,7 +358,7 @@ Ainsi vous pourrez choisir, au moment du démarrage, quel système lancer.
 <term>bootloader-installer</term><listitem><para>
 
 Ce programme installe un programme d'amorçage sur le disque choisi&nbsp;;
-c'est nécessaire pour démarrer Linux sans lecteur de disquette ou sans cédérom.
+c'est nécessaire pour démarrer &arch-kernel; sans lecteur de disquette ou sans cédérom.
 Beaucoup de programmes d'amorçage permettent de choisir le système 
 d'exploitation que l'on veut lancer au démarrage de la machine.
 
diff --git a/it/using-d-i/modules/base-installer.xml b/it/using-d-i/modules/base-installer.xml
index 8d2c10a20..2c1e89e7f 100644
--- a/it/using-d-i/modules/base-installer.xml
+++ b/it/using-d-i/modules/base-installer.xml
@@ -36,13 +36,13 @@ vederli.
 </para><para>
 
 <!--
-As part of the installation, a Linux kernel will be installed. At the default
+As part of the installation, a &arch-kernel; kernel will be installed. At the default
 priority, the installer will choose one for you that best matches your
 hardware. In lower priority modes, you will be able to choose from a list
 of available kernels.
 -->
 
-Come parte dell'installazione viene installato un kernel Linux. Usando la
+Come parte dell'installazione viene installato un kernel &arch-kernel;. Usando la
 priorità predefinita il programma d'installazione sceglie il kernel che
 meglio si adatta al proprio hardware. Nelle modalità con priorità più bassa
 è possibile scegliere uno dei kernel fra quelli disponibili.
diff --git a/it/using-d-i/using-d-i.xml b/it/using-d-i/using-d-i.xml
index 839e10bbd..b035cb58c 100644
--- a/it/using-d-i/using-d-i.xml
+++ b/it/using-d-i/using-d-i.xml
@@ -560,11 +560,11 @@ hardware) che si trovano nelle schede madri più recenti.
 
 <!--
 Installs the most basic set of packages which would allow
-the computer to operate under Linux when rebooted.
+the computer to operate under &debian; when rebooted.
 -->
 
 Installa l'insieme dei pacchetti di base che consentono al
-computer di funzionare sotto Linux dopo il riavvio.
+computer di funzionare sotto &debian; dopo il riavvio.
 
 </para></listitem>
 </varlistentry>
@@ -633,14 +633,14 @@ all'avvio, quale sistema operativo attivare.
 
 <!--
 The various bootloader installers each install a boot loader program on the
-hard disk, which is necessary for the computer to start up using Linux
+hard disk, which is necessary for the computer to start up using &arch-kernel;
 without using a floppy or CD-ROM.  Many boot loaders allow the user to
 choose an alternate operating system each time the computer boots.
 -->
 
 Diversi programmi d'installazione dei boot loader ognuno dei quali
 installa un programma di avvio sul disco rigido, necessario
-al computer per avviarsi con Linux senza usare un floppy o un CD-ROM.
+al computer per avviarsi con &arch-kernel; senza usare un floppy o un CD-ROM.
 Molti programmi di avvio consentono all'utente di scegliere un sistema
 operativo alternativo ogni volta che il computer si avvia.
 
diff --git a/nl/using-d-i/modules/base-installer.xml b/nl/using-d-i/modules/base-installer.xml
index e9db20851..215fe6974 100644
--- a/nl/using-d-i/modules/base-installer.xml
+++ b/nl/using-d-i/modules/base-installer.xml
@@ -17,7 +17,7 @@ uitgevoerd vanaf een seriële console, kunt u ze daar raadplegen.
 
 </para><para>
 
-Als onderdeel van de installatie zal een Linux kernel worden geïnstalleerd.
+Als onderdeel van de installatie zal een &arch-kernel; kernel worden geïnstalleerd.
 Tijdens een standaard installatie zal het installatiesysteem een kernel voor
 u kiezen die het beste past bij uw apparatuur. Bij installaties op een
 lagere prioriteit zal een lijst worden getoond met beschikbare kernels waaruit
diff --git a/nl/using-d-i/using-d-i.xml b/nl/using-d-i/using-d-i.xml
index 52161e956..764124e69 100644
--- a/nl/using-d-i/using-d-i.xml
+++ b/nl/using-d-i/using-d-i.xml
@@ -322,7 +322,7 @@ die op sommige nieuwere moederborden voorkomen.
 <term>base-installer</term><listitem><para>
 
 Installeert een basisset van pakketten die het mogelijk maken om de
-computer, nadat deze is herstart, onder Linux te laten functioneren.
+computer, nadat deze is herstart, onder &debian; te laten functioneren.
 
 </para></listitem>
 </varlistentry>
@@ -371,7 +371,7 @@ manier kiezen welk besturingssysteem moet worden gestart.
 <term>bootloader-installer</term><listitem><para>
 
 Installeert een opstartlader (boot loader) programma op de harde schijf. Dit
-is noodzakelijk om de computer onder Linux te laten opstarten zonder een
+is noodzakelijk om de computer onder &arch-kernel; te laten opstarten zonder een
 diskette of CD te gebruiken. Veel opstartladers kennen de mogelijkheid om
 de gebruiker &mdash; elke keer dat de computer wordt opgestart &mdash; te
 laten kiezen uit verschillende besturingssystemen.
diff --git a/po/el/using-d-i.po b/po/el/using-d-i.po
index e947a6a54..ced89bd26 100644
--- a/po/el/using-d-i.po
+++ b/po/el/using-d-i.po
@@ -611,10 +611,10 @@ msgstr "base-installer "
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
 "Εγκαθιστά το πιό βασικό σύνολο πακέτων, γεγονός που θα επιτρέψει στον "
-"υπολογιστή να λειτουργήσει σε περιβάλλον Linux μετά από την επανεκκίνησή του."
+"υπολογιστή να λειτουργήσει σε περιβάλλον &debian; μετά από την επανεκκίνησή του."
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -697,13 +697,13 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "Τα διάφορα προγράμματα φορτωτών εκκίνησης εγκαθιστούν έναν φορτωτή εκκίνησης "
 "στο σκληρό δίσκο, που είναι απαραίτητος για να ξεκινήσει ο υπολογιστής τη "
-"χρήση Linux χωρίς να χρειάζεται μια δισκέττα ή CD-ROM. Πολλοί φορτωτές "
+"χρήση &arch-kernel; χωρίς να χρειάζεται μια δισκέττα ή CD-ROM. Πολλοί φορτωτές "
 "εκκίνησης επιτρέπουν στο χρήστη  να επιλέξει ένα εναλλακτικό λειτουργικό "
 "σύστημα κάθε φορά που ξεκινά ο υπολογιστής."
 
@@ -3619,12 +3619,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"Θα εγκατασταθεί ένα πυρήνας Linux, ως τμήμα της εγκατάστασης. Με την "
+"Θα εγκατασταθεί ένα πυρήνας &arch-kernel;, ως τμήμα της εγκατάστασης. Με την "
 "προκαθορισμένη προτεραιότητα, ο εγκαταστάτης θα διαλέξει ένα πυρήνα που "
 "ταιριάζει πιο πολύ στο υλικό σας. Στις καταστάσεις χαμηλότερης "
 "προτεραιότητας, θα είστε σε θέση να επιλέξετε από μια λίστα διαθεσίμων "
diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po
index 8d533b6a2..b26519145 100644
--- a/po/fi/using-d-i.po
+++ b/po/fi/using-d-i.po
@@ -570,9 +570,9 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
-"Asennetaan niukin peruskokoonpano, jolla Linux saadaan käyttöön tietokonetta "
+"Asennetaan niukin peruskokoonpano, jolla &debian; saadaan käyttöön tietokonetta "
 "käynnistettäessä."
 
 #. Tag: term
@@ -3389,12 +3389,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"Asennuksen yhdeydessä asennetaa Linux-ydin. Oletusprioriteettia käytettäessä "
+"Asennuksen yhdeydessä asennetaa &arch-kernel;-ydin. Oletusprioriteettia käytettäessä "
 "asennin valitse parhaiten laitteistolle sopivan ytimen. Käytettäessä "
 "pienempää prioriteettia ydin voidaan valita luettelosta."
 
diff --git a/po/hu/using-d-i.po b/po/hu/using-d-i.po
index 3de569da6..b67d141fd 100644
--- a/po/hu/using-d-i.po
+++ b/po/hu/using-d-i.po
@@ -578,9 +578,9 @@ msgstr "base-installer (alap-telepítő)"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
-"Telepíti a legfontosabb csomagokat, mely lehetővé teszi a gép Linux alatti "
+"Telepíti a legfontosabb csomagokat, mely lehetővé teszi a gép &debian; alatti "
 "működtetését újraindítás után."
 
 #. Tag: term
@@ -660,12 +660,12 @@ msgstr "bootloader-installer (boot-betöltő telepítő)"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "A boot-betöltő telepítők bármelyike egy boot-betöltőt telepít a "
-"merevlemezre, mely szükséges, ha a Linuxot nem flopiról vagy CD-ROM lemezről "
+"merevlemezre, mely szükséges, ha a &arch-kernel; nem flopiról vagy CD-ROM lemezről "
 "indítjuk. A legtöbb boot-betöltő lehetővé teszi más rendszerek indítását is."
 
 #. Tag: term
@@ -3344,12 +3344,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"A telepítés részeként a Linux kernel is települ. Alap elsőbbségben a "
+"A telepítés részeként a &arch-kernel; kernel is települ. Alap elsőbbségben a "
 "telepítő a géphez illő legjobbat választja. Alacsonyabb elsőbbségi módokban "
 "az elérhető kernelek egy listából választhatók."
 
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 9e5377816..4e480a65e 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -569,9 +569,9 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
-"再起動時に、コンピュータが Linux として動作するための、もっとも基本的なパッ"
+"再起動時に、コンピュータが &debian; として動作するための、もっとも基本的なパッ"
 "ケージセットをインストールします。"
 
 #. Tag: term
@@ -649,12 +649,12 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "様々なブートローダインストーラがそれぞれ、ハードディスクにブートローダプログ"
-"ラムをインストールします。これは、フロッピーや CD-ROM を使用しないで Linux を"
+"ラムをインストールします。これは、フロッピーや CD-ROM を使用しないで &arch-kernel; を"
 "起動するのに必要です。ブートローダの多くは、コンピュータが起動するごとに代替"
 "オペレーティングシステムを選ぶことができます。"
 
@@ -3355,12 +3355,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"インストールの途中で、Linux カーネルをインストールします。デフォルトの優先度"
+"インストールの途中で、&arch-kernel; カーネルをインストールします。デフォルトの優先度"
 "では、インストーラはハードウェアと最も適合するカーネルを選びます。より低い優"
 "先度モードでは、利用可能なカーネルのリストから選ぶことができます。"
 
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index 2699817fd..02fd41c07 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -598,10 +598,10 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
 "Instala o conjunto de pacotes mais básicos que permitem ao computador operar "
-"sob Linux quando for reiniciado."
+"sob &debian; quando for reiniciado."
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -680,13 +680,13 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "Cada um dos vários instaladores de gestores de arranque instala um programa "
 "que inicia o arranque a partir do disco rígido, que é necessário para o "
-"computador iniciar com Linux sem utilizar uma disquete ou CD-ROM. Muitos "
+"computador iniciar com &arch-kernel; sem utilizar uma disquete ou CD-ROM. Muitos "
 "gestores de arranque permitem ao utilizador, cada vez que o computador "
 "inicia, escolher um sistema operativo alternativo."
 
@@ -3511,12 +3511,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"Como parte da instalação, um kernel Linux irá ser instalado. Como primeira "
+"Como parte da instalação, um kernel &arch-kernel; irá ser instalado. Como primeira "
 "prioridade, o instalador ir-lhe-á escolher um que melhor coincide com o seu "
 "hardware. Nos modos de prioridade mais baixa, você poderá escolher a partir "
 "de uma lista de kernels disponíveis."
diff --git a/po/ro/using-d-i.po b/po/ro/using-d-i.po
index 6dbb8c79a..b72ae8af0 100644
--- a/po/ro/using-d-i.po
+++ b/po/ro/using-d-i.po
@@ -607,10 +607,10 @@ msgstr "instalatorul bazei - base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
 "Instalează un set de pachete de  bază care ar permite calculatorului să "
-"opereze în Linux după ce va fi repornit."
+"opereze în &debian; după ce va fi repornit."
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -689,12 +689,12 @@ msgstr "instalatorul de încărcător de sistem - bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "Diversele instalatoare de încărcătoare de sistem instalează pe discul fix un "
-"program, lucru care permite pornirea sistemului în Linux fără a folosi o "
+"program, lucru care permite pornirea sistemului în &arch-kernel; fără a folosi o "
 "dischetă sau un CD. Multe încărcătoare de sistem permit utilizatorului să "
 "aleagă "
 
@@ -3423,7 +3423,7 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
diff --git a/po/ru/using-d-i.po b/po/ru/using-d-i.po
index 7dc629594..f461a1532 100644
--- a/po/ru/using-d-i.po
+++ b/po/ru/using-d-i.po
@@ -587,10 +587,10 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
 "Устанавливает самый минимальный набор пакетов, который позволит компьютеру "
-"работать под Linux после перезагрузки."
+"работать под &debian; после перезагрузки."
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -670,12 +670,12 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "Устанавливает на жёсткий диск программу системный загрузчик, которая "
-"необходима для того, чтобы компьютер запустился под Linux без использования "
+"необходима для того, чтобы компьютер запустился под &arch-kernel; без использования "
 "дискеты или компакт-диска. Многие системные загрузчики позволяют "
 "пользователю выбрать загрузку альтернативной операционной системы при старте "
 "компьютера."
@@ -3458,12 +3458,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"В одной из частей установки выполняется установка ядра Linux. С приоритетом "
+"В одной из частей установки выполняется установка ядра &arch-kernel;. С приоритетом "
 "по умолчанию программа установки выберет ядро наиболее подходящее для вашего "
 "оборудования. В режимах с низким приоритетом, это предложат сделать вам из "
 "списка доступных ядер."
diff --git a/po/sv/using-d-i.po b/po/sv/using-d-i.po
index 3e3707e7a..c504819aa 100644
--- a/po/sv/using-d-i.po
+++ b/po/sv/using-d-i.po
@@ -347,8 +347,8 @@ msgstr "base-installer"
 #. Tag: para
 #: using-d-i.xml:315
 #, no-c-format
-msgid "Installs the most basic set of packages which would allow the computer to operate under Linux when rebooted."
-msgstr "Installerar de mest enkla paketuppsättningar som tillåter datorn att köra Linux efter omstart."
+msgid "Installs the most basic set of packages which would allow the computer to operate under &debian; when rebooted."
+msgstr "Installerar de mest enkla paketuppsättningar som tillåter datorn att köra &debian; efter omstart."
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -407,8 +407,8 @@ msgstr "bootloader-installer"
 #. Tag: para
 #: using-d-i.xml:361
 #, no-c-format
-msgid "The various bootloader installers each install a boot loader program on the hard disk, which is necessary for the computer to start up using Linux without using a floppy or CD-ROM. Many boot loaders allow the user to choose an alternate operating system each time the computer boots."
-msgstr "De olika installerarna av starthanterare installerar ett starthanteringsprogram på hårddisken som är nödvändig för att datorn ska starta upp med Linux utan att använda en diskett eller cd-rom. Många starthanterare låter användaren välja ett alternativt operativsystem varje gång datorn startas."
+msgid "The various bootloader installers each install a boot loader program on the hard disk, which is necessary for the computer to start up using &arch-kernel; without using a floppy or CD-ROM. Many boot loaders allow the user to choose an alternate operating system each time the computer boots."
+msgstr "De olika installerarna av starthanterare installerar ett starthanteringsprogram på hårddisken som är nödvändig för att datorn ska starta upp med &arch-kernel; utan att använda en diskett eller cd-rom. Många starthanterare låter användaren välja ett alternativt operativsystem varje gång datorn startas."
 
 #. Tag: term
 #: using-d-i.xml:372
@@ -1799,8 +1799,8 @@ msgstr "De olika meddelandena om uppackning/konfigurering som genereras under de
 #. Tag: para
 #: using-d-i.xml:2105
 #, no-c-format
-msgid "As part of the installation, a Linux kernel will be installed. At the default priority, the installer will choose one for you that best matches your hardware. In lower priority modes, you will be able to choose from a list of available kernels."
-msgstr "Som en del av installationen kommer en Linux-kärna att installeras. Vid standardprioritet kommer installationsprogrammet att välja en åt dig som bäst passar din maskinvara. I lägre prioritetslägen kommer du kunna välja från en lista av tillgängliga kärnor."
+msgid "As part of the installation, a &arch-kernel; kernel will be installed. At the default priority, the installer will choose one for you that best matches your hardware. In lower priority modes, you will be able to choose from a list of available kernels."
+msgstr "Som en del av installationen kommer en &arch-kernel;-kärna att installeras. Vid standardprioritet kommer installationsprogrammet att välja en åt dig som bäst passar din maskinvara. I lägre prioritetslägen kommer du kunna välja från en lista av tillgängliga kärnor."
 
 #. Tag: para
 #: using-d-i.xml:2112
diff --git a/po/vi/using-d-i.po b/po/vi/using-d-i.po
index e1cc76b97..36ce602c8 100644
--- a/po/vi/using-d-i.po
+++ b/po/vi/using-d-i.po
@@ -603,10 +603,10 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
+"operate under &debian; when rebooted."
 msgstr ""
 "Thành phần này cài đặt bộ gói cơ bản nhất cho máy tính khả năng hoạt động "
-"được dưới Linux khi được khởi động lại."
+"được dưới &debian; khi được khởi động lại."
 
 # Name: don't translate / Tên: đừng dịch
 #. Tag: term
@@ -692,12 +692,12 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "Mỗi trình cài đặt bộ nạp khởi động có cài đặt một chương trình tải khởi động "
-"vào đĩa cứng, mà cần thiết để máy tính khởi động được bằng Linux, không dùng "
+"vào đĩa cứng, mà cần thiết để máy tính khởi động được bằng &arch-kernel;, không dùng "
 "đĩa mềm hay đĩa CD-ROM. Nhiều bộ nạp khởi động cho người dùng có khả năng "
 "chọn hệ điều hành xen kẽ vào lúc khởi động máy tính."
 
@@ -3465,12 +3465,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"Trong khi cài đặt cơ bản, một hạt nhân Linux sẽ được cài đặt. Tại ưu tiên "
+"Trong khi cài đặt cơ bản, một hạt nhân &arch-kernel; sẽ được cài đặt. Tại ưu tiên "
 "mặc định, trình cài đặt sẽ chọn cho bạn hạt nhân khớp tốt nhất phần cứng của "
 "bạn. Trong chế độ ưu tiên thấp hơn, bạn có khả năng chọn trong danh sách các "
 "hạt nhân có sẵn."
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index fa5fe549c..fc4f3f6ee 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -519,8 +519,8 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
-msgstr "安装一些基本的包，让计算机重启后能在 Linux 下运行。"
+"operate under &debian; when rebooted."
+msgstr "安装一些基本的包，让计算机重启后能在 &debian; 下运行。"
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -593,12 +593,12 @@ msgstr "bootloader-installer"
 #, no-c-format
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
-"hard disk, which is necessary for the computer to start up using Linux "
+"hard disk, which is necessary for the computer to start up using &arch-kernel; "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
 msgstr ""
 "bootloader 安装程序在硬盘上安装 boot loader 程序，这是必须的一步，使得计算机"
-"启动 Linux 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开机的时候"
+"启动 &arch-kernel; 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开机的时候"
 "选择启动哪个操作系统。"
 
 #. Tag: term
@@ -3108,12 +3108,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"作为安装的一部分，Linux 内核也要安装。在默认的优先级下，安装程序会选择一个与"
+"作为安装的一部分，&arch-kernel; 内核也要安装。在默认的优先级下，安装程序会选择一个与"
 "您硬件最匹配的内核。在较低的优先级下，您可以从列表中选择一个有效的内核。"
 
 #. Tag: para
diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po
index 6f33f7246..8567a0846 100644
--- a/po/zh_TW/using-d-i.po
+++ b/po/zh_TW/using-d-i.po
@@ -532,8 +532,8 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under Linux when rebooted."
-msgstr "安裝一些基本的套件，讓電腦重起後能在 Linux 下運行。"
+"operate under &debian; when rebooted."
+msgstr "安裝一些基本的套件，讓電腦重起後能在 &debian; 下運行。"
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -2952,12 +2952,12 @@ msgstr ""
 #: using-d-i.xml:2105
 #, no-c-format
 msgid ""
-"As part of the installation, a Linux kernel will be installed. At the "
+"As part of the installation, a &arch-kernel; kernel will be installed. At the "
 "default priority, the installer will choose one for you that best matches "
 "your hardware. In lower priority modes, you will be able to choose from a "
 "list of available kernels."
 msgstr ""
-"作為安裝的一部分，Linux 核心也會被安裝。在預設的優先等級下，安裝程式會選擇一"
+"作為安裝的一部分，&arch-kernel; 核心也會被安裝。在預設的優先等級下，安裝程式會選擇一"
 "個與您硬體最匹配的核心。在較低的優先級下，您可以從列表中選擇一個有效的核心。"
 
 #. Tag: para
diff --git a/pt_BR/using-d-i/modules/base-installer.xml b/pt_BR/using-d-i/modules/base-installer.xml
index 39ae9ac77..69a1bbe7f 100644
--- a/pt_BR/using-d-i/modules/base-installer.xml
+++ b/pt_BR/using-d-i/modules/base-installer.xml
@@ -23,7 +23,7 @@ instalação estiver sendo realizada através de um console serial.
 
 </para><para>
 
-Como parte da instalação, o kernel do Linux será instalado. Na prioridade
+Como parte da instalação, o kernel do &arch-kernel; será instalado. Na prioridade
 padrão, o programa de instalação escolherá um que melhor se encaixa com seu
 hardware. Em modos de baixa prioridade, você será capaz de selecionar um
 kernel da lista de kernels disponíveis.
diff --git a/pt_BR/using-d-i/using-d-i.xml b/pt_BR/using-d-i/using-d-i.xml
index 50f2bec6a..7438c261e 100644
--- a/pt_BR/using-d-i/using-d-i.xml
+++ b/pt_BR/using-d-i/using-d-i.xml
@@ -326,7 +326,7 @@ encontradas em placas mãe mais novas.
 <term>base-installer</term><listitem><para>
 
 Instala o conjunto mais básico de pacotes que permitirá que
-o computador funcione sob o Linux quando reinicializado.
+o computador funcione sob o &debian; quando reinicializado.
 
 </para></listitem>
 </varlistentry>
@@ -374,7 +374,7 @@ de selecionar que sistema operacional deverá ser usado na partida do sistema.
 
 Os vários instaladores de gerenciadores de inicialização instalam
 cada qual um programa gerenciador de inicialização no disco rígido, o qual
-é necessário para que o computador inicie usando Linux sem utilizar um
+é necessário para que o computador inicie usando &arch-kernel; sem utilizar um
 disquete ou um CD-ROM. Muitos gerenciadores de inicialização permitem que
 o usuário escolha um sistema operacional alternativo a cada vez que o
 computador inicia.