22 files changed, 42 insertions, 41 deletions
diff --git a/ca/appendix/chroot-install.xml b/ca/appendix/chroot-install.xml
index 715f6ce55..64984d66d 100644
--- a/ca/appendix/chroot-install.xml
+++ b/ca/appendix/chroot-install.xml
@@ -9,7 +9,7 @@
 Aquesta secció explica com instal·lar &debian-gnu; des d'un
 Unix o Linux, sense utilitzar el sistema de menús de l'instal·lador com
 s'explica a tot aquest manual. Aquest COM ES FA d'<quote>instal·lació
-creuada</quote> l'han demanat usuaris de Red Hat, Mandrake i SuSE que
+creuada</quote> l'han demanat usuaris de Red Hat, Mandriva i SuSE que
 migren a &debian-gnu;. En aquesta secció es pressuposa una certa familiaritat
 amb la introducció d'ordres *nix i la navegació pel sistema de fitxers.
 En aquesta secció, <prompt>$</prompt> significa que l'ordre s'ha d'introduir
diff --git a/cs/appendix/chroot-install.xml b/cs/appendix/chroot-install.xml
index 93f574554..72634b2ac 100644
--- a/cs/appendix/chroot-install.xml
+++ b/cs/appendix/chroot-install.xml
@@ -9,7 +9,7 @@
 Tato kapitola se, na rozdíl od zbytku příručky, nezabývá oficiálním
 instalačním programem, ale popisuje instalaci &debian;u ze stávajícího
 unixového nebo linuxového systému. Tuto kapitolu si vyžádali uživatelé
-přecházející z distribucí Red Hat, Mandrake a SUSE. Předpokládáme zde
+přecházející z distribucí Red Hat, Mandriva a SUSE. Předpokládáme zde
 jisté znalosti s používáním *nixových příkazů a pohybem v souborovém
 systému. V této sekci platí, že příkazy uvozené promptem
 <prompt>$</prompt> zadáváte ve svém stávajícím systému, zatímco
diff --git a/de/appendix/chroot-install.xml b/de/appendix/chroot-install.xml
index e1c45fdea..2c1ceb883 100644
--- a/de/appendix/chroot-install.xml
+++ b/de/appendix/chroot-install.xml
@@ -10,7 +10,7 @@ Dieses Kapitel beschreibt, wie man &debian-gnu; von einem vorhandenen
 Unix- oder Linux-System aus installiert, ohne den
 menügeführten Installer zu verwenden, der im Rest dieses Handbuchs
 beschrieben wird. Dieses <quote>Quereinsteiger-HowTo</quote>
-wurde von Leuten erbeten, die von Red Hat, Mandrake oder Suse zu
+wurde von Leuten erbeten, die von Red Hat, Mandriva oder Suse zu
 &debian-gnu; wechseln. In diesem Kapitel gehen wir davon aus, dass Sie
 ein wenig Erfahrung mit *nix-Befehlen haben sowie mit der Navigation
 durch das Dateisystem. In diesem Abschnitt symbolisiert ein <prompt>$</prompt>
diff --git a/debian/changelog b/debian/changelog
index 17ee6a732..66cfbe2cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Factorize os-specific parameters in build/arch-options.
   * Rename debian entity to debian-gnu. Introduce new debian entity which just
     stands for "Debian".
+  * Rename Mandrake into Mandriva (Closes: Bug#601308).
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index e41a8b14d..abd92882f 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -10,7 +10,7 @@ This section explains how to install &debian-gnu; from an existing
 Unix or Linux system, without using the menu-driven installer as
 explained in the rest of the manual. This <quote>cross-install</quote>
 HOWTO has been requested by users switching to &debian-gnu; from
-Red Hat, Mandrake, and SUSE. In this section some familiarity with
+Red Hat, Mandriva, and SUSE. In this section some familiarity with
 entering *nix commands and navigating the file system is assumed. In
 this section, <prompt>$</prompt> symbolizes a command to be entered in
 the user's current system, while <prompt>#</prompt> refers to a
diff --git a/fr/appendix/chroot-install.xml b/fr/appendix/chroot-install.xml
index 4db97e653..2d69efa4f 100644
--- a/fr/appendix/chroot-install.xml
+++ b/fr/appendix/chroot-install.xml
@@ -8,7 +8,7 @@
 Cette partie explique comment installer &debian-gnu; à partir d'un système
 Unix ou Linux existant, sans utiliser le système d'installation avec menus
 qui est exposé dans la suite de ce manuel. Les utilisateurs
-qui changeaient leur distribution Red Hat, Mandrake et Suse pour &debian-gnu;
+qui changeaient leur distribution Red Hat, Mandriva et Suse pour &debian-gnu;
 réclamaient ce guide d'installation. Dans cette 
 partie, on suppose que le lecteur a acquis une certaine familiarité avec 
 les commandes *nix et qu'il sait parcourir un système de fichiers.
diff --git a/it/appendix/chroot-install.xml b/it/appendix/chroot-install.xml
index 4e10f5c3d..6c1fe595e 100644
--- a/it/appendix/chroot-install.xml
+++ b/it/appendix/chroot-install.xml
@@ -11,7 +11,7 @@ This section explains how to install &debian-gnu; from an existing
 Unix or Linux system, without using the menu-driven installer as
 explained in the rest of the manual. This <quote>cross-install</quote>
 HOWTO has been requested by users switching to &debian-gnu; from
-Red Hat, Mandrake, and SUSE. In this section some familiarity with
+Red Hat, Mandriva, and SUSE. In this section some familiarity with
 entering *nix commands and navigating the file system is assumed. In
 this section, <prompt>$</prompt> symbolizes a command to be entered in
 the user's current system, while <prompt>#</prompt> refers to a
@@ -21,7 +21,7 @@ command entered in the &debian; chroot.
 In questa sezione viene spiegato come installare &debian-gnu; a partire da un
 sistema Unix o Linux esistente, senza utilizzare l'installatore a menu come
 illustrato nel resto del manuale. Questo HOWTO sul <quote>cross-install</quote>
-è stato richiesto da utenti di altre distribuzioni, come Red Hat, Mandrake e
+è stato richiesto da utenti di altre distribuzioni, come Red Hat, Mandriva e
 SUSE, che vogliono provare &debian-gnu;. Viene data per acquisita da parte
 dell'utente una minima familiarità con i comandi *nix e con la navigazione
 del file system. In questa sezione, <prompt>$</prompt> indica un comando da
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 8b9e72476..6d0be6cdf 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -10,7 +10,7 @@ This section explains how to install &debian-gnu; from an existing
 Unix or Linux system, without using the menu-driven installer as
 explained in the rest of the manual. This <quote>cross-install</quote>
 HOWTO has been requested by users switching to &debian-gnu; from
-Red Hat, Mandrake, and SUSE. In this section some familiarity with
+Red Hat, Mandriva, and SUSE. In this section some familiarity with
 entering *nix commands and navigating the file system is assumed. In
 this section, <prompt>$</prompt> symbolizes a command to be entered in
 the user's current system, while <prompt>#</prompt> refers to a
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index 168261c8e..edeb70838 100644
--- a/po/el/random-bits.po
+++ b/po/el/random-bits.po
@@ -871,7 +871,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -881,7 +881,7 @@ msgstr ""
 "from Unix ή Linux σύστημα, χωρίς τη χρήση του βασισμένου στις ncurses, και "
 "οδηγούμενου από το μενού εγκαταστάτη όπως εξηγείται στο υπόλοιπο αυτού του "
 "εγχειριδίου. Αυτό το \"cross-install\" HOWTO έχει ζητηθεί από χρήστες που "
-"αλλάζουν σε &debian-gnu; από διανομές όπως οι Redhat, Mandrake, και SUSE. "
+"αλλάζουν σε &debian-gnu; από διανομές όπως οι Redhat, Mandriva, και SUSE. "
 "Στην ενότητα αυτή προϋποθέτουμε κάποια οικειότητα στην εισαγωγή εντολών *nix "
 "και πλοήγησης στο σύστημα αρχείων. Εδώ, η παρακίνηση <prompt>$</prompt> "
 "συμβολίζει μια εντολή που πρέπει να εισαχθεί στο υπάρχον σύστημα του χρήστη, "
diff --git a/po/es/random-bits.po b/po/es/random-bits.po
index b8e35e06b..3fcd4f4c9 100644
--- a/po/es/random-bits.po
+++ b/po/es/random-bits.po
@@ -889,7 +889,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -898,7 +898,7 @@ msgstr ""
 "Esta sección explica cómo instalar &debian-gnu; desde un sistema Unix o "
 "Linux existente, sin usar el instalador basado en menús, como se explica en "
 "el resto de este manual. Los usuarios que se cambian a &debian-gnu; desde "
-"Red Hat, Mandrake y SuSE han solicitado este CÓMO de <quote>instalación "
+"Red Hat, Mandriva y SuSE han solicitado este CÓMO de <quote>instalación "
 "cruzada</quote>. En esta sección se asume alguna familiaridad con la "
 "introducción de órdenes en *nix y navegación en el sistema de ficheros. En "
 "esta sección <prompt>$</prompt> simboliza una orden a introducirse en el "
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index 79cf1069b..911c480a8 100644
--- a/po/fi/random-bits.po
+++ b/po/fi/random-bits.po
@@ -849,7 +849,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -859,7 +859,7 @@ msgstr ""
 "tai Linux-järjestelmästä käyttämättä valikkopohjaista asenninta josta muut "
 "osat tätä ohjetta kertovat. Tämä ohjetta <quote>ristiinasennuksesta</quote> "
 "ovat pyytäneet käyttäjät jotka vaihtavat &debian-gnu;iin järjestelmistä Red "
-"Hat, Mandrake ja SUSE. Tässä luvussa edellytetään jonkinlaista kokemusta "
+"Hat, Mandriva ja SUSE. Tässä luvussa edellytetään jonkinlaista kokemusta "
 "*nix-komennoista ja tiedostojärjestelmässä liikkumisesta. Tässä luvussa "
 "<prompt>$</prompt> tarkoittaa komentoa joka kirjoitetaan koneessa jo "
 "olevassa käyttöjärjestelmässä, ja <prompt>#</prompt> tarkoittaa chroot-"
diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po
index d5a3d103a..ceb432a61 100644
--- a/po/hu/random-bits.po
+++ b/po/hu/random-bits.po
@@ -855,7 +855,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -865,7 +865,7 @@ msgstr ""
 "vagy Linux rendszer alól a menü-vezérelt telepítő nélkül, amit már leírtunk "
 "e kézikönyvben. E <quote>kereszt-telepítő</quote> HOGYAN leírást seregnyi "
 "felhasználónk kérte, akik &debian-gnu; rendszerre váltanak mégpedig "
-"üzemszünet nélkül például Red Hat, Mandrake és SUSE disztribúciókról. A "
+"üzemszünet nélkül például Red Hat, Mandriva és SUSE disztribúciókról. A "
 "szakasz azért feltételezi legalább a legalapvetőbb *nix parancsok és "
 "fájlrendszer ismeretét. E szakaszban a <prompt>$</prompt> a felhasználó "
 "mostani rendszerében, a <prompt>#</prompt> a &debian; chroot környezetben "
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index 1b7f4efca..e671f1dd2 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -845,7 +845,7 @@ msgstr "Unix/Linux システムからの &debian-gnu; のインストール"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -854,7 +854,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -863,7 +863,7 @@ msgstr ""
 "本節は、マニュアルの他の部分で説明されているメニュードリブンインストーラを使"
 "用せずに、既存の Unix・Linux システムから &debian-gnu; をインストールする方法"
 "について説明します。この <quote>クロスインストール</quote> HOWTO は、Red "
-"Hat, Mandrake, SUSE から &debian-gnu; に移行するユーザの要望で書かれました。"
+"Hat, Mandriva, SUSE から &debian-gnu; に移行するユーザの要望で書かれました。"
 "本節では、*nix コマンドの入力について熟知し、ファイルシステムを操作できるのが"
 "前提となっています。本節では、<prompt>#</prompt>が Debian chroot に入力された"
 "コマンドを示し、<prompt>$</prompt> はユーザの現在のシステムに入力されるコマン"
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index e455df5b6..94f66e9fe 100644
--- a/po/ko/random-bits.po
+++ b/po/ko/random-bits.po
@@ -844,7 +844,7 @@ msgstr "유닉스/리눅스 시스템에서 &debian-gnu; 설치하기"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -853,7 +853,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -862,7 +862,7 @@ msgstr ""
 "이 부분에서는 (이 안내서의 다른 부분에 설명한) ncurses 기반 메뉴 방식 설치 프"
 "로그램을 사용하지 않고, 기존 유닉스 혹은 리눅스 시스템을 이용해 &debian-gnu; "
 "배포판을 설치하는 방법을 설명합니다. 이 <quote>크로스 설치</quote> 하우투는 "
-"Red Hat, Mandrake, SUSE에서 &debian-gnu; 배포판으로 바꾸려는 사용자에게 필요"
+"Red Hat, Mandriva, SUSE에서 &debian-gnu; 배포판으로 바꾸려는 사용자에게 필요"
 "한 부분입니다. 여기서는 유닉스 계열의 명령어를 입력하는 방법이나 파일 시스템"
 "을 돌아다니는 데 익숙해져 있다고 가정합니다. 여기서 <prompt>$</prompt> 표시"
 "는 사용자의 기존 시스템에서 입력하는 명령어이고, <prompt>#</prompt> 표시는 데"
diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index 1964dbb53..aeb77b883 100644
--- a/po/pot/random-bits.pot
+++ b/po/pot/random-bits.pot
@@ -703,7 +703,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:360
 #, no-c-format
-msgid "This section explains how to install &debian-gnu; from an existing Unix or Linux system, without using the menu-driven installer as explained in the rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this section some familiarity with entering *nix commands and navigating the file system is assumed. In this section, <prompt>$</prompt> symbolizes a command to be entered in the user's current system, while <prompt>#</prompt> refers to a command entered in the &debian; chroot."
+msgid "This section explains how to install &debian-gnu; from an existing Unix or Linux system, without using the menu-driven installer as explained in the rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian-gnu; from Red Hat, Mandriva, and SUSE. In this section some familiarity with entering *nix commands and navigating the file system is assumed. In this section, <prompt>$</prompt> symbolizes a command to be entered in the user's current system, while <prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index f6425fb32..e23c35eef 100644
--- a/po/pt/random-bits.po
+++ b/po/pt/random-bits.po
@@ -857,7 +857,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -867,7 +867,7 @@ msgstr ""
 "ou Linux existente, sem utilizar o instalador guiado pelo menu como é "
 "explicado no resto do manual. Este <quote>cross-install</quote> HOWTO foi "
 "pedido por utilizadores que mudam para &debian-gnu; a partir de Red Hat, "
-"Mandrake e SUSE. Nesta secção é assumida alguma familiaridade em introduzir "
+"Mandriva e SUSE. Nesta secção é assumida alguma familiaridade em introduzir "
 "comandos *nix e navegar através do sistema de ficheiros. Nesta secção, "
 "<prompt>$</prompt> simboliza um comando a ser escrito pelo utilizador do "
 "sistema actual, e <prompt>#</prompt> refere-se a comandos introduzidos no "
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index d2cd0d781..89220fc14 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -858,7 +858,7 @@ msgstr "Установка &debian-gnu; из системы Unix/Linux"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -867,7 +867,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -877,7 +877,7 @@ msgstr ""
 "системы Unix или Linux без использования управляемой из меню программы "
 "установки, основанной на библиотеке ncurses, как это описывается в остальном "
 "руководстве. Это <quote>междистрибутивное</quote> HOWTO попросили "
-"пользователи, переходящие на &debian-gnu; из Redhat, Mandrake и SUSE. В этом "
+"пользователи, переходящие на &debian-gnu; из Redhat, Mandriva и SUSE. В этом "
 "разделе подразумевается наличие некоторого опыта работы с командами *nix и "
 "навигации по файловой системе. Здесь символ <prompt>$</prompt> означает "
 "команду, вводимую в текущей пользовательской системе, а <prompt>#</prompt> "
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index fe908eb5c..2f0c6b321 100644
--- a/po/sv/random-bits.po
+++ b/po/sv/random-bits.po
@@ -852,7 +852,7 @@ msgstr "Installera &debian-gnu; från ett Unix/Linux-system"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -861,7 +861,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -871,7 +871,7 @@ msgstr ""
 "befintligt Unix- eller Linux-system, utan att använda det menystyrda "
 "installationsprogrammet som förklaras i resten av handboken. Den här HOWTO:n "
 "för <quote>cross-installation</quote> har efterfrågats av användare som "
-"byter till &debian-gnu; från Red Hat, Mandrake och SUSE. I detta avsnitt "
+"byter till &debian-gnu; från Red Hat, Mandriva och SUSE. I detta avsnitt "
 "antas att viss erfarenhet av *nix-kommandon och navigering i filsystemet. I "
 "detta avsnitt symboliserar <prompt>$</prompt> ett kommando som ska anges i "
 "användarens aktuella system, medan <prompt>#</prompt> refererar till ett "
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index ef1784b95..c4a1edd60 100644
--- a/po/vi/random-bits.po
+++ b/po/vi/random-bits.po
@@ -855,7 +855,7 @@ msgstr "Cài đặt &debian-gnu; từ hệ thống UNIX/Linux"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -864,7 +864,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -874,7 +874,7 @@ msgstr ""
 "Linux đã có, không cần dùng trình cài đặt dựa vào trình đơn như được diễn tả "
 "trong phần sổ tay còn lại. Tài liệu <quote>cài đặt chéo</quote> Thế Nào này "
 "đã được yêu cầu bởi người dùng chuyển đổi sang &debian-gnu; từ hệ thống Red "
-"Hat, Mandrake, và SUSE. Trong phần này giả sử là bạn quen với cách nhập lệnh "
+"Hat, Mandriva, và SUSE. Trong phần này giả sử là bạn quen với cách nhập lệnh "
 "*nix và cách duyệt qua hệ thống tập tin. Trong phần này, dấu đồng <prompt>$</"
 "prompt> đại diện lệnh cần nhập vào hệ thống hiện thời của người dùng, còn "
 "dấu băm <prompt>#</prompt> đại diện lệnh được nhập vào chroot của &debian;."
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index ad3861e2f..c0f1dc5f9 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -826,7 +826,7 @@ msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -835,7 +835,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -843,7 +843,7 @@ msgid ""
 msgstr ""
 "本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
 "后面要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
-"HOWTO 是应用户的要求而撰写的。他们原来是 Redhat、Mandrake 和 SUSE 的用户，现"
+"HOWTO 是应用户的要求而撰写的。他们原来是 Redhat、Mandriva 和 SUSE 的用户，现"
 "转而使用 &debian-gnu;。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中"
 "穿梭移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当"
 "前使用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 Debian chroot "
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index 04e9c683a..20b1a277f 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -804,7 +804,7 @@ msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 #| "This section explains how to install &debian-gnu; from an existing Unix "
 #| "or Linux system, without using the menu-driven installer as explained in "
 #| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 #| "SUSE. In this section some familiarity with entering *nix commands and "
 #| "navigating the file system is assumed. In this section, <prompt>$</"
 #| "prompt> symbolizes a command to be entered in the user's current system, "
@@ -813,7 +813,7 @@ msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
 "rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
 "SUSE. In this section some familiarity with entering *nix commands and "
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
@@ -821,7 +821,7 @@ msgid ""
 msgstr ""
 "本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian-gnu;，而非使用本手"
 "冊後面要談到的基於 ncurses，由選單驅動的安裝軟體。這篇<quote>交叉安裝(cross-"
-"install)</quote> HOWTO 是應使用者的要求而撰寫的。他們原來是 Redhat、Mandrake "
+"install)</quote> HOWTO 是應使用者的要求而撰寫的。他們原來是 Redhat、Mandriva "
 "和 SUSE 的使用者，現轉而使用 &debian-gnu;。在本節中，我們假設您對於輸入 *nix "
 "指令以及在檔案系統中穿梭移動並不生疏。同時，在本節中，<prompt>$</prompt> 符號"
 "表示這個指令是在使用者當前使用的系統中輸入的，而 <prompt>#</prompt> 則表示這"
diff --git a/pt_BR/appendix/chroot-install.xml b/pt_BR/appendix/chroot-install.xml
index 238668607..c5d379719 100644
--- a/pt_BR/appendix/chroot-install.xml
+++ b/pt_BR/appendix/chroot-install.xml
@@ -12,7 +12,7 @@ Esta seção explica como instalar o &debian-gnu; a partir de um
 sistema Unix ou Linux já existente, sem usar o sistema de instalação
 guiado por menus como explicado no resto deste manual. O HOWTO
 <quote>cross-install</quote> foi pedido por usuários que estavam
-migrando para o &debian-gnu; a partir do Red Hat, Mandrake e SUSE.
+migrando para o &debian-gnu; a partir do Red Hat, Mandriva e SUSE.
 É assumida nesta seção alguma familiaridade com a linha de comando e
 navegação no sistema de arquivos. O símbolo <prompt>$</prompt>
 significa um comando que será executado por um usuário atual do