Fix "partitioning" part for non-Linux ports.

31 files changed, 130 insertions, 130 deletions

diff --git a/ca/partitioning/partition-programs.xml b/ca/partitioning/partition-programs.xml
index 5fea18074..b3e509fe4 100644
--- a/ca/partitioning/partition-programs.xml
+++ b/ca/partitioning/partition-programs.xml
@@ -20,7 +20,7 @@ per a la vostra arquitectura.
 
 És l'eina de Debian recomanada per fer particions. Aquesta navalla suïssa també
 pot redimensionar particions, crear sistemes de fitxers
-<phrase arch="x86"> (<quote>formatar</quote> en terminologia de Windows)</phrase>
+<phrase arch="any-x86"> (<quote>formatar</quote> en terminologia de Windows)</phrase>
 i associar-los a punts de muntatge.
 
 </para></listitem>
diff --git a/ca/partitioning/partition/x86.xml b/ca/partitioning/partition/x86.xml
index 5745bafd8..673fb5e20 100644
--- a/ca/partitioning/partition/x86.xml
+++ b/ca/partitioning/partition/x86.xml
@@ -34,7 +34,7 @@ podeu subdividir-ne l'espai en particions lògiques. Es poden crear fins a
 60 particions lògiques per partició estesa; amb tot, sols podeu tenir una
 partició estesa per cada unitat física.
 
-</para><para>
+</para><para arch="linux-any">
 
 El Linux limita les particions per unitat física a 15 en discs SCSI
 (3 de primàries, 12 de lògiques), i a 63 en una unitat IDE (3 de
@@ -61,8 +61,8 @@ la BIOS per traslladar el nucli del disc a la RAM. Si es troben a la BIOS
 les extensions int 0x13 d'accés a discs grans, s'empraran. Si no, es farà
 servir la interfície antiga d'accés al disc, i no es podrà emprar per
 adreçar-se a cap lloc del disc superior al cilindre 1023è. Una vegada
-s'ha arrencat el Linux, independentment de la BIOS de l'ordinador,
-aquestes restriccions ja no s'apliquen, car el Linux no fa servir la BIOS
+s'ha arrencat el &arch-kernel;, independentment de la BIOS de l'ordinador,
+aquestes restriccions ja no s'apliquen, car el &arch-kernel; no fa servir la BIOS
 per accedir al disc.
 
 </para><para>
@@ -84,7 +84,7 @@ MiB són prou) al principi del disc, a fi d'emprar-la com a partició
 d'arrencada, i després crear les particions que vulgueu a l'espai restant.
 Aquesta partició d'arrencada <emphasis>s'ha de</emphasis> muntar a
 <filename>/boot</filename>, car aquest és el directori d'emmagatzematge
-del(s) nucli(s) del Linux. Aquesta configuració funciona en qualsevol
+del(s) nucli(s) del &arch-kernel;. Aquesta configuració funciona en qualsevol
 sistema, independentment de si es fa servir l'LBA o la traducció CHS de
 discs grans, i independentment també de si la BIOS permet l'ús
 d'extensions d'accés a discs grans.
diff --git a/cs/partitioning/partition-programs.xml b/cs/partitioning/partition-programs.xml
index 1f296664e..83e20b22b 100644
--- a/cs/partitioning/partition-programs.xml
+++ b/cs/partitioning/partition-programs.xml
@@ -18,7 +18,7 @@ Pro váš typ počítače jsou k dispozici:
 
 Doporučený nástroj, který umí kromě dělení disků i měnit velikost
 oblastí, vytvářet souborové
-systémy <phrase arch="x86"> (v řeči Windows
+systémy <phrase arch="any-x86"> (v řeči Windows
 <quote>formátovat</quote>) </phrase> a přiřadit je k přípojným bodům.
 
 </para></listitem>
diff --git a/cs/partitioning/partition/x86.xml b/cs/partitioning/partition/x86.xml
index 5d46b24da..8232a6580 100644
--- a/cs/partitioning/partition/x86.xml
+++ b/cs/partitioning/partition/x86.xml
@@ -21,7 +21,7 @@ můžete tento prostor využít k vytvoření libovolného počtu (max. 60)
 logických částí. Na disku lze však vytvořit maximálně jeden rozšířený
 oddíl.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux omezuje počet oddílů na disk takto: 15 oddílů pro disky SCSI
 (tři primární a dvanáct logických) a 63 oddílů na discích IDE
@@ -47,8 +47,8 @@ operační paměti. Jestliže jsou v BIOSu přítomna rozšíření pro přístu
 k velkým diskům (přes přerušení 0x13), pak budou použita. V opačném
 případě je použito původní rozhraní pro přístup k diskům, které
 bohužel neumí adresovat oblasti nad 1023. cylindrem.
-Avšak v okamžiku, kdy je Linux zaveden, už nezáleží na omezeních
-BIOSu, protože Linux k přístupu na disky BIOS nepoužívá.
+Avšak v okamžiku, kdy je &arch-kernel; zaveden, už nezáleží na omezeních
+BIOSu, protože &arch-kernel; k přístupu na disky BIOS nepoužívá.
 
 </para><para>
 
diff --git a/de/partitioning/partition-programs.xml b/de/partitioning/partition-programs.xml
index 8caf72e54..ef3593e3b 100644
--- a/de/partitioning/partition-programs.xml
+++ b/de/partitioning/partition-programs.xml
@@ -21,7 +21,7 @@ Programme, die für Ihre Architektur verfügbar sind:
 Das bevorzugte Partitionierungswerkzeug in Debian. Dieses Schweizer Messer
 unter den Partitionierungsprogrammen kann auch die Größe von bestehenden
 Partitionen verändern sowie Dateisysteme erstellen
-<phrase arch="x86"> (in der Windows-Sprache <quote>formatieren</quote>) </phrase>
+<phrase arch="any-x86"> (in der Windows-Sprache <quote>formatieren</quote>) </phrase>
 und die Einhängepunkte zuweisen.
 
 </para></listitem>
diff --git a/de/partitioning/partition/x86.xml b/de/partitioning/partition/x86.xml
index c3a70d25e..7b7bc696d 100644
--- a/de/partitioning/partition/x86.xml
+++ b/de/partitioning/partition/x86.xml
@@ -37,7 +37,7 @@ Partition einnimmt, in logische Partitionen aufteilen. Sie können bis zu
 60 logische Partitionen in einer erweiterten Partition erstellen, allerdings
 können Sie pro Festplatte nur eine erweiterte Partition haben.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux beschränkt die Partitionen pro Platte auf 15 bei SCSI-Festplatten
 (3 nutzbare primäre Partitionen, 12 logische Partitionen) und auf 63
@@ -66,9 +66,9 @@ das BIOS nutzen, um den Kernel von der Platte in den RAM zu laden.
 Wenn die <quote>BIOS Int 0x13 Large Disk Access Extensions</quote> im BIOS gefunden
 werden, werden Sie auch genutzt. Andernfalls wird das <quote>Legacy Disk Access Interface</quote>
 als Fallback genutzt; allerdings können dann keine Festplattenbereiche
-oberhalb des 1023. Zylinders angesprochen werden. Sobald Linux gebootet ist,
+oberhalb des 1023. Zylinders angesprochen werden. Sobald &arch-kernel; gebootet ist,
 spielen diese Einschränkungen keine Rolle mehr, egal welches BIOS der Rechner
-hat, da Linux das BIOS für den Festplattenzugriff nicht mehr benötigt.
+hat, da &arch-kernel; das BIOS für den Festplattenzugriff nicht mehr benötigt.
 
 </para><para>
 
@@ -89,7 +89,7 @@ Partition (25&ndash;50MB sollten reichen) am Anfang der Platte zu erzeugen, die
 dann als Boot-Partition genutzt wird; danach können Sie in dem verbleibenden
 Bereich Partitionen nach Ihren Vorstellungen anlegen. Diese Boot-Partition
 <emphasis>muss</emphasis> als <filename>/boot</filename>
-ins Dateisystem eingebunden werden, da dort der oder die Linux-Kernel
+ins Dateisystem eingebunden werden, da dort der oder die &arch-kernel;-Kernel
 gespeichert werden. Diese Konfiguration sollte auf allen Systemen funktionieren,
 egal, ob LBA-Adressierung oder <quote>CHS-Translation</quote> für große Festplatten
 genutzt wird und unabhängig davon, ob Ihr BIOS die <quote>Large Disk Access Extensions</quote> unterstützt.
diff --git a/debian/changelog b/debian/changelog
index 4f4663b30..8c55d0252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,8 @@ 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", "boot-new", "post-install", "howto", and
-    "preseed" parts for non-Linux ports.
+  * Fix "preparing", "using-d-i", "boot-new", "post-install", "howto",
+    "preseed", and "partitioning" parts for non-Linux ports.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml
index d77cefe85..dcb0009c0 100644
--- a/en/partitioning/partition-programs.xml
+++ b/en/partitioning/partition-programs.xml
@@ -20,7 +20,7 @@ your architecture.
 
 Recommended partitioning tool in Debian. This Swiss army knife can
 also resize partitions, create filesystems
-<phrase arch="x86"> (<quote>format</quote> in Windows speak)</phrase>
+<phrase arch="any-x86"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
 
 </para></listitem>
@@ -114,7 +114,7 @@ One of these programs will be run by default when you select
 to use a different partitioning tool from the command line on VT2, but this
 is not recommended.
 
-</para><para arch="x86">Remember to mark your boot partition as
+</para><para arch="any-x86">Remember to mark your boot partition as
 <quote>Bootable</quote>.
 
 </para><para condition="mac-fdisk.txt">
diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml
index a0b5366f2..01979f2e7 100644
--- a/en/partitioning/partition/x86.xml
+++ b/en/partitioning/partition/x86.xml
@@ -35,7 +35,7 @@ partitions.  You can create up to 60 logical partitions per extended
 partition; however, you can only have one extended partition per
 drive.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux limits the partitions per drive to 15 partitions for SCSI disks
 (3 usable primary partitions, 12 logical partitions), and 63
@@ -63,8 +63,8 @@ kernel from the disk into RAM.  If the BIOS int 0x13 large disk access
 extensions are found to be present, they will be utilized. Otherwise,
 the legacy disk access interface is used as a fall-back, and it cannot
 be used to address any location on the disk higher than the 1023rd
-cylinder.  Once Linux is booted, no matter what BIOS your computer
-has, these restrictions no longer apply, since Linux does not use the
+cylinder.  Once &arch-kernel; is booted, no matter what BIOS your computer
+has, these restrictions no longer apply, since &arch-kernel; does not use the
 BIOS for disk access.
 
 </para><para>
@@ -86,7 +86,7 @@ should suffice) partition at the beginning of the disk to be used as
 the boot partition, and then create whatever other partitions you wish
 to have, in the remaining area.  This boot partition
 <emphasis>must</emphasis> be mounted on <filename>/boot</filename>,
-since that is the directory where the Linux kernel(s) will be stored.
+since that is the directory where the &arch-kernel; kernel(s) will be stored.
 This configuration will work on any system, regardless of whether LBA
 or large disk CHS translation is used, and regardless of whether your
 BIOS supports the large disk access extensions.
diff --git a/es/partitioning/partition-programs.xml b/es/partitioning/partition-programs.xml
index e809f54b4..d20f06c1d 100644
--- a/es/partitioning/partition-programs.xml
+++ b/es/partitioning/partition-programs.xml
@@ -22,7 +22,7 @@ pueden aplicar a su arquitectura.
 
 Herramienta original de Linux para particionar discos. Esta �navaja suiza�
 tambi�n puede ajustar el tama�o de las particiones,
-crear sistemas de ficheros <phrase arch="x86">
+crear sistemas de ficheros <phrase arch="any-x86">
 (como se llama en Windows a <quote>formatear</quote>) </phrase> y
 asignarlos a sus respectivos puntos de montaje.
 
diff --git a/es/partitioning/partition/x86.xml b/es/partitioning/partition/x86.xml
index 858322158..c4564e0f0 100644
--- a/es/partitioning/partition/x86.xml
+++ b/es/partitioning/partition/x86.xml
@@ -37,7 +37,7 @@ espacio asignado dentro de �sta en particiones l�gicas. Puede crear hasta
 60 particiones l�gicas en cada partici�n extendida; sin embargo,
 puede tener solamente una partici�n extendida por disco.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux limita a 15 particiones como m�ximo por cada disco SCSI
 (3 particiones primarias, 12 particiones l�gicas), y 63 particiones en
@@ -66,8 +66,8 @@ y cargarlo en la RAM. Si la BIOS dispone de las extensiones �int 0x13� de
 acceso a discos grandes, se usar�n esas extensiones. De otra manera, se
 utilizar� la interfaz nativa de acceso a disco, que no se podr� usar
 para acceder a posiciones superiores al cilindro 1023. Una vez que se inicie
-Linux, no tiene importancia el BIOS que tenga, ya que las restricciones
-ya no se aplican m�s, puesto que Linux no utiliza el BIOS para acceder
+&arch-kernel;, no tiene importancia el BIOS que tenga, ya que las restricciones
+ya no se aplican m�s, puesto que &arch-kernel; no utiliza el BIOS para acceder
 a los discos.
 
 </para><para>
@@ -91,7 +91,7 @@ usarla como partici�n de arranque, y despu�s, en el �rea restante, crear
 las otras particiones que desee tener.
 Esta partici�n de arranque, se <emphasis>debe</emphasis> montar en
 <filename>/boot</filename>, ya que es en este directorio donde se
-almacenar�n los n�cleos de Linux.
+almacenar�n los n�cleos de &arch-kernel;.
 Est� configuraci�n funcionar� en cualquier sistema, sin importar si se utiliza
 traducci�n LBA o CHS, ni tampoco si su BIOS soporta las extensiones para
 discos grandes.
diff --git a/eu/partitioning/partition-programs.xml b/eu/partitioning/partition-programs.xml
index 6bab6f57b..c7e62ae48 100644
--- a/eu/partitioning/partition-programs.xml
+++ b/eu/partitioning/partition-programs.xml
@@ -14,7 +14,7 @@ programen zerrenda bat dator.
 <term><command>partman</command></term>

 <listitem><para>

 Debianen partizio tresna gomendatua. Programa honek gauza anitzetarako

-balio du, hala nola <phrase arch="x86"> (<quote>formatudun</quote>) </phrase>

+balio du, hala nola <phrase arch="any-x86"> (<quote>formatudun</quote>) </phrase>

 fitxategi sistemak sortu eta norberaren muntaia puntuei egokitzeko.

 </para></listitem>

 </varlistentry>

diff --git a/fr/partitioning/partition-programs.xml b/fr/partitioning/partition-programs.xml
index be6f00eda..c4985325e 100644
--- a/fr/partitioning/partition-programs.xml
+++ b/fr/partitioning/partition-programs.xml
@@ -19,7 +19,7 @@ Voici les programmes qui sont disponibles sur votre architecture&nbsp;:
 
 C'est le partitionneur que recommande Debian. Ce <quote>couteau suisse</quote>
 sait aussi redimensionner des partitions et monter des systèmes de fichiers
-<phrase arch="x86"> (<quote>formater</quote> en langage Windows)</phrase>
+<phrase arch="any-x86"> (<quote>formater</quote> en langage Windows)</phrase>
 sur des points de montage.
 
 </para></listitem>
diff --git a/fr/partitioning/partition/x86.xml b/fr/partitioning/partition/x86.xml
index 2658f2dee..911751060 100644
--- a/fr/partitioning/partition/x86.xml
+++ b/fr/partitioning/partition/x86.xml
@@ -39,7 +39,7 @@ partition en partitions «&nbsp;logiques&nbsp;». La partition étendue peut
 contenir jusqu'à 60 partitions logiques&nbsp;; en revanche,
 il ne peut y avoir qu'une seule partition étendue par disque.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux limite le nombre de partitions à 15 par disque SCSI (3
 partitions primaires utilisables et 12 partitions logiques dans la
@@ -70,8 +70,8 @@ Si les extensions du BIOS int 0x13 pour l'accès aux gros disques sont
 présentes, elles seront utilisées. Sinon, l'interface standard d'accès
 au disque sera utilisée par défaut, et elle ne permettra pas de
 démarrer sur des emplacements situés après le 1023e cylindre du
-disque. Une fois que Linux est démarré, peu importe le BIOS de votre
-ordinateur, ces restrictions ne s'appliquent plus, puisque Linux
+disque. Une fois que &arch-kernel; est démarré, peu importe le BIOS de votre
+ordinateur, ces restrictions ne s'appliquent plus, puisque &arch-kernel;
 n'utilise pas le BIOS pour les accès disque.
 
 </para><para>
@@ -94,7 +94,7 @@ partition (25 à 50&nbsp;Mo doivent suffire) en début de disque, qui sera la
 partition de démarrage, puis de créer toutes les autres partitions que
 vous voulez dans l'espace restant. Cette partition de démarrage
 <emphasis>devra</emphasis> être montée sur <filename>/boot</filename>, 
-le répertoire où seront stockés les noyaux Linux. Cette configuration marchera sur tous
+le répertoire où seront stockés les noyaux &arch-kernel;. Cette configuration marchera sur tous
 les systèmes, quel que soit votre mode d'adressage (LBA) ou de
 translation (CHS), et quel que soit votre BIOS, avec ou sans extensions.
 
diff --git a/it/partitioning/partition-programs.xml b/it/partitioning/partition-programs.xml
index 33bde6964..9eca278a5 100644
--- a/it/partitioning/partition-programs.xml
+++ b/it/partitioning/partition-programs.xml
@@ -29,13 +29,13 @@ dell'architettura.
 <!--
 Recommended partitioning tool in Debian. This Swiss army knife can
 also resize partitions, create filesystems
-<phrase arch="x86"> (<quote>format</quote> in Windows speak)</phrase>
+<phrase arch="any-x86"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
 -->
 
 Lo strumento di partizionamento raccomandato da Debian. Questo
 <quote>coltellino svizzero</quote> dai mille usi, può anche ridimensionare
-le partizioni, creare file system <phrase arch="x86">(ossia
+le partizioni, creare file system <phrase arch="any-x86">(ossia
 <quote>formattarli</quote> nel gergo di Windows)</phrase> e assegnarli
 ai punti di montaggio.
 
diff --git a/it/partitioning/partition/x86.xml b/it/partitioning/partition/x86.xml
index d43b2ee1a..0d5286bae 100644
--- a/it/partitioning/partition/x86.xml
+++ b/it/partitioning/partition/x86.xml
@@ -70,7 +70,7 @@ allocato a questa partizione in più partizioni logiche. È possibile creare fin
 a 60 partizioni logiche per ogni partizione estesa, ma è possibile avere solo
 una partizione estesa per ogni disco.
 
-</para><para>
+</para><para arch="linux-any">
 
 <!--
 Linux limits the partitions per drive to 15 partitions for SCSI disks
@@ -116,8 +116,8 @@ kernel from the disk into RAM.  If the BIOS int 0x13 large disk access
 extensions are found to be present, they will be utilized. Otherwise,
 the legacy disk access interface is used as a fall-back, and it cannot
 be used to address any location on the disk higher than the 1023rd
-cylinder.  Once Linux is booted, no matter what BIOS your computer
-has, these restrictions no longer apply, since Linux does not use the
+cylinder.  Once &arch-kernel; is booted, no matter what BIOS your computer
+has, these restrictions no longer apply, since &arch-kernel; does not use the
 BIOS for disk access.
 -->
 
@@ -129,8 +129,8 @@ per leggere il kernel dal disco e caricarlo nella RAM. Se il BIOS supporta le
 estensioni int 0x13 per l'accesso ai dischi grandi, queste verranno utilizzate;
 altrimenti occorrerà utilizzare la vecchia interfaccia di accesso al disco, che
 non può accedere porzioni del disco che si trovano oltre il 1023-esimo cilindro.
-Una volta avviato Linux, qualsiasi sia il BIOS del computer, queste restrizioni
-non sono più vincolanti, visto che Linux non usa il BIOS per accedere al disco.
+Una volta avviato &arch-kernel;, qualsiasi sia il BIOS del computer, queste restrizioni
+non sono più vincolanti, visto che &arch-kernel; non usa il BIOS per accedere al disco.
 
 </para><para>
 
@@ -164,7 +164,7 @@ should suffice) partition at the beginning of the disk to be used as
 the boot partition, and then create whatever other partitions you wish
 to have, in the remaining area.  This boot partition
 <emphasis>must</emphasis> be mounted on <filename>/boot</filename>,
-since that is the directory where the Linux kernel(s) will be stored.
+since that is the directory where the &arch-kernel; kernel(s) will be stored.
 This configuration will work on any system, regardless of whether LBA
 or large disk CHS translation is used, and regardless of whether your
 BIOS supports the large disk access extensions.
@@ -175,7 +175,7 @@ piccola partizione (25&ndash;50MB dovrebbero essere sufficienti) all'inizio
 del disco, da usare come partizione di avvio, e di creare tutte le altre
 partizioni nello spazio rimanente.
 Questa partizione di avvio <emphasis>deve</emphasis> essere montata su
-<filename>/boot</filename>, la directory destinata a contenere i kernel Linux.
+<filename>/boot</filename>, la directory destinata a contenere i kernel &arch-kernel;.
 Questo tipo di configurazione funzionerà su tutti i sistemi, sia che venga usato
 l'LBA o la traduzione CHS, e a prescindere dal fatto che il proprio BIOS
 supporti le estensioni per l'accesso ai dischi grandi.
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index 86b0e9259..e3850e538 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -20,7 +20,7 @@ your architecture.
 
 Recommended partitioning tool in Debian. This Swiss army knife can
 also resize partitions, create filesystems
-<phrase arch="x86"> (<quote>format</quote> in Windows speak)</phrase>
+<phrase arch="any-x86"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
 
 </para></listitem>
diff --git a/nl/partitioning/partition/x86.xml b/nl/partitioning/partition/x86.xml
index 4f1751b5c..0ab228c34 100644
--- a/nl/partitioning/partition/x86.xml
+++ b/nl/partitioning/partition/x86.xml
@@ -35,7 +35,7 @@ partitions.  You can create up to 60 logical partitions per extended
 partition; however, you can only have one extended partition per
 drive.
 
-</para><para>
+</para><para arch="linux-any">
 
 Linux limits the partitions per drive to 15 partitions for SCSI disks
 (3 usable primary partitions, 12 logical partitions), and 63
@@ -63,8 +63,8 @@ kernel from the disk into RAM.  If the BIOS int 0x13 large disk access
 extensions are found to be present, they will be utilized. Otherwise,
 the legacy disk access interface is used as a fall-back, and it cannot
 be used to address any location on the disk higher than the 1023rd
-cylinder.  Once Linux is booted, no matter what BIOS your computer
-has, these restrictions no longer apply, since Linux does not use the
+cylinder.  Once &arch-kernel; is booted, no matter what BIOS your computer
+has, these restrictions no longer apply, since &arch-kernel; does not use the
 BIOS for disk access.
 
 </para><para>
@@ -86,7 +86,7 @@ should suffice) partition at the beginning of the disk to be used as
 the boot partition, and then create whatever other partitions you wish
 to have, in the remaining area.  This boot partition
 <emphasis>must</emphasis> be mounted on <filename>/boot</filename>,
-since that is the directory where the Linux kernel(s) will be stored.
+since that is the directory where the &arch-kernel; kernel(s) will be stored.
 This configuration will work on any system, regardless of whether LBA
 or large disk CHS translation is used, and regardless of whether your
 BIOS supports the large disk access extensions.
diff --git a/po/el/partitioning.po b/po/el/partitioning.po
index a169d4bd0..f26af315e 100644
--- a/po/el/partitioning.po
+++ b/po/el/partitioning.po
@@ -878,12 +878,12 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Συνιστώμενο εργαλείο διαμέρισης στο Debian. Αυτό το εργαλείο πραγματικά για "
 "κάθε χρήση μπορεί επίσης να αλλάξει το μέγεθος των κατατμήσεων, να "
-"δημιουργήσει συστήματα αρχείων <phrase arch=\"x86\"> (<quote>format</quote> "
+"δημιουργήσει συστήματα αρχείων <phrase arch=\"any-x86\"> (<quote>format</quote> "
 "στην γλώσσα των Windows)</phrase> και να τις αντιστοιχήσει στα διάφορα "
 "σημεία προσάρτησης."
 
@@ -1207,8 +1207,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Αυτός ο περιορισμός δεν υφίσταται αν έχετε ένα BIOS μεταγενέστερπ από το "
@@ -1221,7 +1221,7 @@ msgstr ""
 "παλιότερο interface  πρόσβασης δίσκου θα χρησιμοποιηθεί σαν λύση ασφαλείας, "
 "που δεν μπορεί να χρησιμοποιηθεί για την διευθυνσιοδότηση οποιουδήποτε "
 "μέρους του δίσκου πέρα από τον 1023ο κύλινδρο. Από την στιγμή της εκκίνησης "
-"του Linux όμως όλοι αυτοί οι περιορισμοί δεν ισχύουν πια αφού το Linux δεν "
+"του &arch-kernel; όμως όλοι αυτοί οι περιορισμοί δεν ισχύουν πια αφού το &arch-kernel; δεν "
 "χρησιμοποιεί το BIOS για την πρόσβαση των δίσκων."
 
 #. Tag: para
@@ -1257,7 +1257,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1268,7 +1268,7 @@ msgstr ""
 "τις όποιες άλλες κατατμήσεις θέλετε στον χώρο του δίσκου που περισσεύει. "
 "Αυτή η κατάτμηση εκκίνησης <emphasis>πρέπει</emphasis> να είναι προσαρτημένη "
 "στο σημείο προσάρτησης <filename>/boot</filename>, μιας και αυτός είναι ο "
-"κατάλογος όπου θα πρέπει να αποθηκεύονται οι πυρήνες του Linux. Αυτή η "
+"κατάλογος όπου θα πρέπει να αποθηκεύονται οι πυρήνες του &arch-kernel;. Αυτή η "
 "διαμόρφωση θα δουλέψει σε οποιοδήποτε σύστημα άσχετα από την χρήση LBA ή CHS "
 "μετάφρασης μεγάλων δίσκων και ανεξάρτητα από το αν το BIOS σας υποστηρίζει "
 "τις επεκτάσεις πρόσβασης μεγάλων δίσκων."
diff --git a/po/fi/partitioning.po b/po/fi/partitioning.po
index f7b1733b8..53f8d42f9 100644
--- a/po/fi/partitioning.po
+++ b/po/fi/partitioning.po
@@ -826,11 +826,11 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Debianin suositeltu osiointisovellus. Tämä monitoimityökalu osaa myös "
-"muuttaa osion kokoa, luoda tiedostojärjestelmiä <phrase arch=\"x86\"> "
+"muuttaa osion kokoa, luoda tiedostojärjestelmiä <phrase arch=\"any-x86\"> "
 "(<quote>formatoida</quote> Windowsin termeillä)</phrase> ja liittää ne "
 "liitoskohtiin."
 
@@ -1139,8 +1139,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Tätä rajoitusta ei ole jos BIOS on uudempi kuin noin 1995&ndash;98 (riippuu "
@@ -1150,8 +1150,8 @@ msgstr ""
 "ytimen lukemiseen levyltä keskusmuistiin. Jos BIOSin keskeytystä 0x13 "
 "käyttävä lisäys isojen levyjen käyttöön löytyy, sitä käytetään. Muussa "
 "tapauksessa peräydytään käyttämään perinteistä levyrajapintaa, joka ei osaa "
-"käyttää levyosoitteita 1023. sylinterin jälkeen. Kun Linux on käynnistynyt, "
-"ei BIOSilla enää ole merkitystä, koska Linux ei käytä levyä BIOSin kautta."
+"käyttää levyosoitteita 1023. sylinterin jälkeen. Kun &arch-kernel; on käynnistynyt, "
+"ei BIOSilla enää ole merkitystä, koska &arch-kernel; ei käytä levyä BIOSin kautta."
 
 #. Tag: para
 #: partitioning.xml:655
@@ -1183,7 +1183,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1192,7 +1192,7 @@ msgstr ""
 "osion luominen levyn alkuun käytettäväksi käynnistysosiona, ja luoda muut "
 "tarvittavat osiot jäljelle jäävään osaan levyä. Tämä käynnistysosio "
 "<emphasis>on liitettävä</emphasis> kohtaan <filename>/boot</filename>, koska "
-"tuohon hakemistoon tallennetaan Linux-ytimet. Tämä järjestely toimii "
+"tuohon hakemistoon tallennetaan &arch-kernel;-ytimet. Tämä järjestely toimii "
 "kaikissa järjestelmissä, eikä ole väliä onko käytössä LBA tai CHS "
 "translation mode tai tukeeko BIOS lisäystä isojen levyjen käyttöön."
 
diff --git a/po/hu/partitioning.po b/po/hu/partitioning.po
index 1658fc39c..0426fbe88 100644
--- a/po/hu/partitioning.po
+++ b/po/hu/partitioning.po
@@ -825,11 +825,11 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "A Debian rendszer ajánlott particionáló eszköze. Ez a svájci bicska "
-"átméretez partíciókat, létrehoz fájlrendszereket <phrase arch=\"x86\"> "
+"átméretez partíciókat, létrehoz fájlrendszereket <phrase arch=\"any-x86\"> "
 "(<quote>formáz</quote> a windowsos-nyelvűeknél)</phrase> és csatolási "
 "pontokhoz rendeli őket."
 
@@ -1130,8 +1130,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Ezt már meghaladja minden (gyártótól függően) 1995&ndash;98  utáni BIOS, "
@@ -1140,8 +1140,8 @@ msgstr ""
 "<command>mbr</command> program számára is szükséges a BIOS használata a "
 "kernel a lemezről a RAM-ba olvasásához. Ha a BIOS 0x13 nagy lemez-elérő "
 "kiterjesztések elérhetők, ezeket fogják használni. Ha nem, akkor az elavult "
-"lemez-elérő felület, mely nem használható az 1023. cilinder felett. A Linux "
-"indulása után a BIOS többé nem számít, a Linux nem használja BIOS-t a lemez-"
+"lemez-elérő felület, mely nem használható az 1023. cilinder felett. A &arch-kernel; "
+"indulása után a BIOS többé nem számít, a &arch-kernel; nem használja BIOS-t a lemez-"
 "eléréshez sem."
 
 #. Tag: para
@@ -1174,7 +1174,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1183,7 +1183,7 @@ msgstr ""
 "partíció létrehozása az indító partícióra használt lemez elején és más "
 "partíciók létrehozása a fennmaradó területen. Az indító partíciót "
 "<emphasis>kötelező</emphasis> a <filename>/boot</filename> könyvtárba "
-"csatolni, mivel ez a Linux kernel(ek) helye. Ez esetben az lehet az előny, "
+"csatolni, mivel ez a &arch-kernel; kernel(ek) helye. Ez esetben az lehet az előny, "
 "hogy e konfiguráció a legvégső esetben a legrégebbi rendszereken is működik "
 "függetlenül az LBA vagy nagy lemez CHS áthelyezéstől és még attól is, hogy "
 "az elavult BIOS támogatja-e a nagy lemez-elérés kiterjesztéseket."
diff --git a/po/ja/partitioning.po b/po/ja/partitioning.po
index 97c6edd1b..5cd64c29e 100644
--- a/po/ja/partitioning.po
+++ b/po/ja/partitioning.po
@@ -848,11 +848,11 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Debian 推奨のパーティション分割ツールです。このアーミーナイフは、 パーティ"
-"ションサイズを変更したり、ファイルシステムを作成 <phrase arch=\"x86\"> "
+"ションサイズを変更したり、ファイルシステムを作成 <phrase arch=\"any-x86\"> "
 "(Windows で言うところの <quote>フォーマット</quote>) </phrase> したり、マウン"
 "トポイントを指定したりすることもできます。"
 
@@ -1168,8 +1168,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "1995〜98 年あたり (メーカーによって異なります) 以降に製造され、 "
@@ -1179,7 +1179,7 @@ msgstr ""
 "に、 いずれも BIOS を利用しなければなりません。 BIOS の int 0x13 ラージディス"
 "クアクセス拡張が利用できるなら そちらが利用されますが、 できない場合は旧式の"
 "アクセスインターフェースが利用されます。 そして後者では 1023 シリンダまでしか"
-"アクセスできません。 なお、一度 Linux が起動してしまえば、 Linux は ディスク"
+"アクセスできません。 なお、一度 &arch-kernel; が起動してしまえば、 &arch-kernel; は ディスク"
 "アクセスに BIOS を利用しませんから、 お使いの BIOS が何であれ、この制限を気に"
 "する必要はありません。"
 
@@ -1213,14 +1213,14 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
 msgstr ""
 "お勧めは、起動用の小さなパーティション (25〜50MB あれば充分です) をディスクの"
 "先頭に作成し、 残りの領域にお好みに合わせて他のパーティションを作成することで"
-"す。 このブートパーティションは、Linux カーネルが収められる <filename>/boot</"
+"す。 このブートパーティションは、&arch-kernel; カーネルが収められる <filename>/boot</"
 "filename> ディレクトリ にマウントしなければ<emphasis>なりません</emphasis>。 "
 "この設定なら、LBA や ラージディスク CHS 変換を利用していたとしても、 また、お"
 "使いの BIOS がラージディスクアクセス拡張をサポートしていたとしても、 いずれの"
diff --git a/po/ko/partitioning.po b/po/ko/partitioning.po
index 11ecc91c9..437aff13f 100644
--- a/po/ko/partitioning.po
+++ b/po/ko/partitioning.po
@@ -819,11 +819,11 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "데비안에서 권장하는 파티션용 프로그램. 이 만능 프로그램은 파티션의 크기를 조"
-"정할 수도 있고, 파일 시스템을 만들고<phrase arch=\"x86\"> (윈도우즈에서 말하"
+"정할 수도 있고, 파일 시스템을 만들고<phrase arch=\"any-x86\"> (윈도우즈에서 말하"
 "는 <quote>포맷</quote>)</phrase>, 마운트 위치도 설정할 수 있습니다."
 
 #. Tag: command
diff --git a/po/pt/partitioning.po b/po/pt/partitioning.po
index 7bb5f7344..db4861e3c 100644
--- a/po/pt/partitioning.po
+++ b/po/pt/partitioning.po
@@ -855,12 +855,12 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Ferramenta de particionamento recomendada em Debian. Este canivete suíço "
 "também pode redimensionar partições, criar sistemas de ficheiros <phrase "
-"arch=\"x86\"> (<quote>format</quote> na linguagem Windows)</phrase> e "
+"arch=\"any-x86\"> (<quote>format</quote> na linguagem Windows)</phrase> e "
 "atribuir-lhes pontos de montagem."
 
 #. Tag: command
@@ -1173,8 +1173,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Esta restrição não se aplica se tiver uma BIOS mais recente que "
@@ -1185,9 +1185,9 @@ msgstr ""
 "discos de grandes dimensões da int 0x13 da BIOS estiverem presentes, serão "
 "utilizadas. Caso contrário, o interface antigo de acesso ao disco é "
 "utilizado como recurso, e não pode ser utilizado para endereçar qualquer "
-"localização acima do 1023º cilindro. Uma vez o Linux iniciado, não interessa "
+"localização acima do 1023º cilindro. Uma vez o &arch-kernel; iniciado, não interessa "
 "que BIOS o seu computador tem, estas restrições já não se aplicam mais, já "
-"que o Linux não utiliza a BIOS para acesso ao disco."
+"que o &arch-kernel; não utiliza a BIOS para acesso ao disco."
 
 #. Tag: para
 #: partitioning.xml:655
@@ -1221,7 +1221,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1231,7 +1231,7 @@ msgstr ""
 "partição de arranque, e então criar todas as outras partições que quer ter, "
 "na restante área. Esta partição de arranque <emphasis>tem</emphasis> de ser "
 "montada em <filename>/boot</filename>, dado que esta é o directório onde o"
-"(s) kernel Linux serão guardados. Esta configuração funcionará em qualquer "
+"(s) kernel &arch-kernel; serão guardados. Esta configuração funcionará em qualquer "
 "sistema, independentemente se é utilizada a tradução LBA ou large disk CHS, "
 "e independente da sua BIOS suportar extensões de acesso a discos de elevada "
 "capacidade."
diff --git a/po/ru/partitioning.po b/po/ru/partitioning.po
index 39b271dbd..281020382 100644
--- a/po/ru/partitioning.po
+++ b/po/ru/partitioning.po
@@ -848,12 +848,12 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Рекомендуемая утилита разметки в Debian. Этот швейцарский армейский нож "
 "может также изменять размеры разделов, создавать файловые системы <phrase "
-"arch=\"x86\"> (как <quote>format</quote> в Windows)</phrase> и назначать им "
+"arch=\"any-x86\"> (как <quote>format</quote> в Windows)</phrase> и назначать им "
 "точки монтирования."
 
 #. Tag: command
@@ -1162,8 +1162,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Этого ограничения нет в BIOS новее 1995&ndash;98 годов (зависит от "
@@ -1173,9 +1173,9 @@ msgstr ""
 "оперативную память. Если будет найдено расширение прерывания BIOS int 0x13 "
 "доступа к диску, то оно будет использовано. Иначе, будет использован обычный "
 "старый интерфейс доступа к диску, и не будут использованы адреса, "
-"расположенные на диске за 1023-им цилиндром. После загрузки Linux, неважно "
+"расположенные на диске за 1023-им цилиндром. После загрузки &arch-kernel;, неважно "
 "какой BIOS имеется в компьютере, эти ограничения больше не действуют, так "
-"как Linux не использует BIOS для доступа к диску."
+"как &arch-kernel; не использует BIOS для доступа к диску."
 
 #. Tag: para
 #: partitioning.xml:655
@@ -1208,7 +1208,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1218,7 +1218,7 @@ msgstr ""
 "качестве загрузочного раздела, а затем создавать любые нужные разделы в "
 "оставшейся области. Загрузочный раздел <emphasis>должен</emphasis> быть "
 "смонтирован в <filename>/boot</filename>, так как в этом каталоге хранятся "
-"ядра Linux. Такая конфигурация будет работать на любой системе, независимо "
+"ядра &arch-kernel;. Такая конфигурация будет работать на любой системе, независимо "
 "используется ли трансляции LBA больших дисков или CHS, и независимо от того "
 "поддерживает ли BIOS расширение для доступа к большим дискам."
 
diff --git a/po/sv/partitioning.po b/po/sv/partitioning.po
index e0390cec6..815da488a 100644
--- a/po/sv/partitioning.po
+++ b/po/sv/partitioning.po
@@ -497,8 +497,8 @@ msgstr "partman"
 #. Tag: para
 #: partitioning.xml:449
 #, no-c-format
-msgid "Recommended partitioning tool in Debian. This Swiss army knife can also resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</quote> in Windows speak)</phrase> and assign them to the mountpoints."
-msgstr "Rekommenderat partitioneringsverktyg i Debian. Den här schweiziska armékniven kan också ändra storlek på partitioner, skapa filsystem <phrase arch=\"x86\"> (<quote>formatera</quote> på Windows-språk)</phrase> och tilldela dem monteringspunkter."
+msgid "Recommended partitioning tool in Debian. This Swiss army knife can also resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</quote> in Windows speak)</phrase> and assign them to the mountpoints."
+msgstr "Rekommenderat partitioneringsverktyg i Debian. Den här schweiziska armékniven kan också ändra storlek på partitioner, skapa filsystem <phrase arch=\"any-x86\"> (<quote>formatera</quote> på Windows-språk)</phrase> och tilldela dem monteringspunkter."
 
 #. Tag: command
 #: partitioning.xml:460
@@ -663,8 +663,8 @@ msgstr "Om du har en stor IDE-disk, och varken använder LBA-adressering eller �
 #. Tag: para
 #: partitioning.xml:641
 #, no-c-format
-msgid "This restriction doesn't apply if you have a BIOS newer than around 1995&ndash;98 (depending on the manufacturer) that supports the <quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the Linux loader, and Debian's alternative <command>mbr</command> must use the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 large disk access extensions are found to be present, they will be utilized. Otherwise, the legacy disk access interface is used as a fall-back, and it cannot be used to address any location on the disk higher than the 1023rd cylinder. Once Linux is booted, no matter what BIOS your computer has, these restrictions no longer apply, since Linux does not use the BIOS for disk access."
-msgstr "Den här begränsningen gäller inte om du har ett BIOS som är nyare än runt 1995&ndash;98 (beroende på tillverkaren) som har stöd för <quote>Enhanced Disk Drive Support Specification</quote>. Både Lilo, Linux-starthanteraren och Debians alternativa <command>mbr</command> måste använda BIOS för att läsa kärnan från disken till RAM-minnet. Om BIOS int 0x13, utökningar för åtkomst till stora diskar, hittas, kommer de att användas. Annars kommer det gamla diskåtkomstgränssnittet att fallas tillbaka på och användas, och det kan inte användas för att adressera en plats på disken högre än 1023:e cylindern. När Linux har startats upp, oavsett vilket BIOS din dator har, gäller dessa begränsningar inte längre, eftersom Linux inte använder BIOS för diskåtkomst."
+msgid "This restriction doesn't apply if you have a BIOS newer than around 1995&ndash;98 (depending on the manufacturer) that supports the <quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the Linux loader, and Debian's alternative <command>mbr</command> must use the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 large disk access extensions are found to be present, they will be utilized. Otherwise, the legacy disk access interface is used as a fall-back, and it cannot be used to address any location on the disk higher than the 1023rd cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk access."
+msgstr "Den här begränsningen gäller inte om du har ett BIOS som är nyare än runt 1995&ndash;98 (beroende på tillverkaren) som har stöd för <quote>Enhanced Disk Drive Support Specification</quote>. Både Lilo, Linux-starthanteraren och Debians alternativa <command>mbr</command> måste använda BIOS för att läsa kärnan från disken till RAM-minnet. Om BIOS int 0x13, utökningar för åtkomst till stora diskar, hittas, kommer de att användas. Annars kommer det gamla diskåtkomstgränssnittet att fallas tillbaka på och användas, och det kan inte användas för att adressera en plats på disken högre än 1023:e cylindern. När &arch-kernel; har startats upp, oavsett vilket BIOS din dator har, gäller dessa begränsningar inte längre, eftersom &arch-kernel; inte använder BIOS för diskåtkomst."
 
 #. Tag: para
 #: partitioning.xml:655
@@ -675,8 +675,8 @@ msgstr "Om du har en stor disk, måste du kanske använda tekniker för cylinder
 #. Tag: para
 #: partitioning.xml:667
 #, no-c-format
-msgid "The recommended way of accomplishing this is to create a small (25&ndash;50MB should suffice) partition at the beginning of the disk to be used as the boot partition, and then create whatever other partitions you wish to have, in the remaining area. This boot partition <emphasis>must</emphasis> be mounted on <filename>/boot</filename>, since that is the directory where the Linux kernel(s) will be stored. This configuration will work on any system, regardless of whether LBA or large disk CHS translation is used, and regardless of whether your BIOS supports the large disk access extensions."
-msgstr "Det rekommenderade sättet att göra det här på är att skapa en liten (25&ndash;50 MB bör räcka) partition i början av disken för att användas som uppstartspartition, och sedan skapa de andra partitioner som du önskar att ha, på återstående plats. Den här uppstartspartitionen <emphasis>måste</emphasis> monteras på <filename>/boot</filename>, eftersom den här är katalogen där Linux kärna/kärnor kommer att lagras. Denna konfiguration kommer att fungera på alla system, oavsett om LBA eller CHS-översättning för stora diskar används, och oavsett om ditt BIOS har stöd för utökningar för åtkomst till stora diskar."
+msgid "The recommended way of accomplishing this is to create a small (25&ndash;50MB should suffice) partition at the beginning of the disk to be used as the boot partition, and then create whatever other partitions you wish to have, in the remaining area. This boot partition <emphasis>must</emphasis> be mounted on <filename>/boot</filename>, since that is the directory where the &arch-kernel; kernel(s) will be stored. This configuration will work on any system, regardless of whether LBA or large disk CHS translation is used, and regardless of whether your BIOS supports the large disk access extensions."
+msgstr "Det rekommenderade sättet att göra det här på är att skapa en liten (25&ndash;50 MB bör räcka) partition i början av disken för att användas som uppstartspartition, och sedan skapa de andra partitioner som du önskar att ha, på återstående plats. Den här uppstartspartitionen <emphasis>måste</emphasis> monteras på <filename>/boot</filename>, eftersom den här är katalogen där &arch-kernel; kärna/kärnor kommer att lagras. Denna konfiguration kommer att fungera på alla system, oavsett om LBA eller CHS-översättning för stora diskar används, och oavsett om ditt BIOS har stöd för utökningar för åtkomst till stora diskar."
 
 #. Tag: para
 #: partitioning.xml:688
diff --git a/po/vi/partitioning.po b/po/vi/partitioning.po
index 652d49661..136b23d69 100644
--- a/po/vi/partitioning.po
+++ b/po/vi/partitioning.po
@@ -841,12 +841,12 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "Công cụ tạo phân vùng khuyến khích trong Debian. Chương trình này có nhiều "
 "khả năng có ích: nó cũng có thể thay đổi kích cỡ của phân vùng, tạo hệ thống "
-"tập tin <phrase arch=\"x86\"> (<quote>format</quote> [định dạng] trên hệ "
+"tập tin <phrase arch=\"any-x86\"> (<quote>format</quote> [định dạng] trên hệ "
 "điều hành Windows)</phrase> và gán nó vào điểm lắp."
 
 # Name: don't translate / Tên: đừng dịch
@@ -1165,8 +1165,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "Sự hạn chế này không có tác động nếu máy tính có BIOS mới hơn năm "
@@ -1176,9 +1176,9 @@ msgstr ""
 "RAM. Nếu nó phát hiện các phần mở rộng truy cập đĩa lớn kiểu BIOS int 0x13, "
 "nó sẽ sử dụng chúng. Nếu không thì giao diện truy cập đĩa thừa tự được dùng "
 "như là khả năng dự trữ; nó cũng không thể được dùng để định vị trí nào trên "
-"đĩa nằm cao hơn hình trụ thứ 1023. Một khi khởi động Linux, kiểu BIOS nào "
+"đĩa nằm cao hơn hình trụ thứ 1023. Một khi khởi động &arch-kernel;, kiểu BIOS nào "
 "không có tác động và những sự hạn chế này không còn có tác động lại, vì "
-"Linux không sử dụng BIOS để truy cập đĩa."
+"&arch-kernel; không sử dụng BIOS để truy cập đĩa."
 
 #. Tag: para
 #: partitioning.xml:655
@@ -1211,7 +1211,7 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
@@ -1220,7 +1220,7 @@ msgstr ""
 "(25&ndash;50 MB nên là đủ) tại đầu của đĩa, để được dùng là phân vùng khởi "
 "động, rồi tạo các phân vùng khác được muốn trong vùng còn lại. Phân vùng "
 "khởi động này <emphasis>cần phải</emphasis> được gắn kết vào <filename>/"
-"boot</filename>, vì đó là thư mục nơi (các) hạt nhân Linux sẽ được cất giữ. "
+"boot</filename>, vì đó là thư mục nơi (các) hạt nhân &arch-kernel; sẽ được cất giữ. "
 "Cấu hình này sẽ hoạt động được trên mọi hệ thống, bất chấp dùng LBA hay khả "
 "năng dịch CHS đĩa lớn, và bất chấp BIOS hỗ trợ các phần mở rộng truy cấp đĩa "
 "lớn."
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 26063736f..cd409f9e6 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -783,11 +783,11 @@ msgstr "partman"
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "推荐的 Debian 分区工具。这把瑞士军刀可以修改分区大小，创建文件系统<phrase "
-"arch=\"x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分区至"
+"arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分区至"
 "挂接点。"
 
 #. Tag: command
@@ -1077,16 +1077,16 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "如果您的 BIOS 在 1995&ndash;98 年之后出现(取决于制造商)，并且支持 "
 "<quote>Enhanced Disk Drive Support Specification</quote>，就没有这个限制。"
 "Linux 的引导程序 Lilo 和 Debian 的 <command>mbr</command> 都必须使用 BIOS 来"
 "从磁盘读取内核至内存。如果 BIOS int 0x13 大硬盘访问拓展被打开，则将被使用。否"
-"则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 Linux 引"
-"导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 Linux 并不使"
+"则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 &arch-kernel; 引"
+"导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 &arch-kernel; 并不使"
 "用 BIOS 来进行磁盘寻址。"
 
 #. Tag: para
@@ -1118,14 +1118,14 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
 msgstr ""
 "解决这个问题的推荐方法，是在磁盘开始处创建一个小的(25&ndash;50MB 足矣)分区来"
 "作为引导分区。并且在其余地方创建另外的分区。这个引导分区<emphasis>必须</"
-"emphasis>挂载到 <filename>/boot</filename> 下，因为它是放置 Linux 内核的地"
+"emphasis>挂载到 <filename>/boot</filename> 下，因为它是放置 &arch-kernel; 内核的地"
 "方。这样的设置将可以在任意系统上工作，不管 LBA 或者大硬盘 CHS 转换是否起作"
 "用，甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
 
diff --git a/po/zh_TW/partitioning.po b/po/zh_TW/partitioning.po
index 4cdd2ecc7..61aa13306 100644
--- a/po/zh_TW/partitioning.po
+++ b/po/zh_TW/partitioning.po
@@ -784,11 +784,11 @@ msgstr "partman"
 #, fuzzy, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"any-x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "這是我們建議的 Debian 分割區工具。這個小而全的工具可以修改分區大小，建立檔案"
-"系統 <phrase arch=\"i386\">(在 Windows 下的說法是 <quote>format</quote>)</"
+"系統 <phrase arch=\"any-x86\">(在 Windows 下的說法是 <quote>format</quote>)</"
 "phrase> 並將分區連結至掛載點。"
 
 #. Tag: command
@@ -1075,8 +1075,8 @@ msgid ""
 "disk access extensions are found to be present, they will be utilized. "
 "Otherwise, the legacy disk access interface is used as a fall-back, and it "
 "cannot be used to address any location on the disk higher than the 1023rd "
-"cylinder. Once Linux is booted, no matter what BIOS your computer has, these "
-"restrictions no longer apply, since Linux does not use the BIOS for disk "
+"cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer has, these "
+"restrictions no longer apply, since &arch-kernel; does not use the BIOS for disk "
 "access."
 msgstr ""
 "如果您的 BIOS 在 1995&mdash;1998 年之後出產(取決於製造商)且支援 "
@@ -1084,8 +1084,8 @@ msgstr ""
 "Linux Loader 以及 Debian 的替代方案 <command>mbr</command> 必須使用 BIOS 從磁"
 "碟讀取核心至記憶體。如果開啟 BIOS int 0x13 高容量硬碟的存取功能，則將被使用，"
 "否則合法的磁碟存取界面會拿來當備用方式，而且它不能定址任何大於 1023rd 磁柱的"
-"位置。一旦 Linux 啟動後，不管電腦的 BIOS 哪一種，這些限制將不再起任何作用，因"
-"為 Linux 不使用 BIOS 來存取硬碟。"
+"位置。一旦 &arch-kernel; 啟動後，不管電腦的 BIOS 哪一種，這些限制將不再起任何作用，因"
+"為 &arch-kernel; 不使用 BIOS 來存取硬碟。"
 
 #. Tag: para
 #: partitioning.xml:655
@@ -1116,14 +1116,14 @@ msgid ""
 "used as the boot partition, and then create whatever other partitions you "
 "wish to have, in the remaining area. This boot partition <emphasis>must</"
 "emphasis> be mounted on <filename>/boot</filename>, since that is the "
-"directory where the Linux kernel(s) will be stored. This configuration will "
+"directory where the &arch-kernel; kernel(s) will be stored. This configuration will "
 "work on any system, regardless of whether LBA or large disk CHS translation "
 "is used, and regardless of whether your BIOS supports the large disk access "
 "extensions."
 msgstr ""
 "解決這個問題的推薦方法，是在磁碟開始處建立一個小的( 5&mdash;10MB 就夠了)分割"
 "區來作為開機分割區。並且在其它地方建立其它的分區。這個開機分割區 <emphasis>必"
-"須</emphasis> 掛載至<filename>/boot</filename> 下，這是因為這是 Linux 核心放"
+"須</emphasis> 掛載至<filename>/boot</filename> 下，這是因為這是 &arch-kernel; 核心放"
 "置的地方。這樣的設定可以在任意系統上運作正常，不管是使用 LBA 或者大硬碟 CHS "
 "轉換，甚至也不管您的 BIOS 是否支援高容量硬碟的存取。"
 
diff --git a/pt_BR/partitioning/partition-programs.xml b/pt_BR/partitioning/partition-programs.xml
index 35033f755..084ff971f 100644
--- a/pt_BR/partitioning/partition-programs.xml
+++ b/pt_BR/partitioning/partition-programs.xml
@@ -21,7 +21,7 @@ programas aplicáveis para sua arquitetura.
 <listitem><para>
 
 Ferramenta de particionamento recomendada na Debian. Esse canivete suíço
-também pode redimensionar, criar sistemas de arquivos <phrase arch="i386">
+também pode redimensionar, criar sistemas de arquivos <phrase arch="any-x86">
 (<quote>formatar</quote> no mundo do Windows) </phrase> e te indicar
 pontos de montagem.
 
diff --git a/pt_BR/partitioning/partition/x86.xml b/pt_BR/partitioning/partition/x86.xml
index e8e86c0b9..14ad78a60 100644
--- a/pt_BR/partitioning/partition/x86.xml
+++ b/pt_BR/partitioning/partition/x86.xml
@@ -38,7 +38,7 @@ espaço alocado para aquela partição em partições lógicas. Você poderá cr
 60 partições lógicas por partição extendida; no entanto você somente poderá ter
 uma partição extendida por unidade.
 
-</para><para>
+</para><para arch="linux-any">
 O Linux limita as partições por unidade a 15 partições para discos
 SCSI (3 partições primárias utilizáveis e 12 partições lógicas) e
 63 partições em uma unidade de discos IDE (3 partições primárias
@@ -67,9 +67,9 @@ extensões 0x13 da BIOS para acesso a discos de grande capacidades
 foram detectadas, elas serão usadas. Caso contrário, a
 interface de acesso a disco é usada como padrão e não poderá ser
 usada para endereçar qualquer localização no disco maior que o
-cilindro 1023. Assim que o Linux for inicializado, não importa qual
+cilindro 1023. Assim que o &arch-kernel; for inicializado, não importa qual
 BIOS seu computador possui, estas restrições não se aplicam mais, pois o
-Linux não utiliza a BIOS para fazer acesso a disco.
+&arch-kernel; não utiliza a BIOS para fazer acesso a disco.
 
 </para><para>
 
@@ -91,7 +91,7 @@ pequena (25 a 50MB deverá ser o suficiente) no início do disco para ser
 usada como partição de inicialização, e então criar qualquer outra
 partição que desejar ter na área restante. Esta partição de inicialização
 <emphasis>deverá</emphasis> ser montada em <filename>/boot</filename>,
-pois este é o diretório aonde o kernel do Linux será armazenado.
+pois este é o diretório aonde o kernel do &arch-kernel; será armazenado.
 Esta configuração funcionará em qualquer sistema, não importando se a
 tradução LBA ou CHR é usada e não importando se sua BIOS suporta as
 extensões de acesso a discos grandes.