[SILENT_COMMIT] Update of POT and PO files for the manual

8 files changed, 151 insertions, 366 deletions

diff --git a/po/el/preseed.po b/po/el/preseed.po
index b6a75c81d..049ad13d7 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -180,7 +180,8 @@ msgstr "<entry>όχι</entry>"
 #. Tag: entry
 #: preseed.xml:93
 #, no-c-format
-msgid "hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase>"
+msgid ""
+"hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase>"
 msgstr ""
 "hd-μέσο <phrase condition=\"bootable-usb\">(συμπεριλαμβάνει usb-stick)</"
 "phrase>"
@@ -1090,12 +1091,14 @@ msgstr ""
 #: preseed.xml:565
 #, no-c-format
 msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
-msgstr "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
+msgstr ""
+"&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
 
 #. Tag: para
 #: preseed.xml:567
 #, no-c-format
-msgid "There are a few rules to keep in mind when writing a preconfiguration file."
+msgid ""
+"There are a few rules to keep in mind when writing a preconfiguration file."
 msgstr ""
 "Υπάρχουν μερικοί κανόνες που θα πρέπει να έχετε στο μυαλό σας όταν γράφετε "
 "ένα αρχείο προρύθμισης."
@@ -1103,23 +1106,20 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:574
 #, no-c-format
-#| msgid ""
-#| "Put only a single space or tab between type and value: any additional "
-#| "whitespace will be interpreted as belonging to the value."
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value. If you specify an "
 "empty value you should still put a single space or tab after the type."
-msgstr "Εισάγετε ένα μοναδικό κενό (space) ή μια μοναδική μετατόπιση θέσης (tab) ανάμεσα σε έναν τύπο και την τιμή του: οποιοδήποτε επιπλέον κενό διάστημα (whitespace) θα ερμηνευθεί σαν να ανήκει στην τιμή. Ακόμα κι αν προσδιορίσετε μια κενή τιμή θα πρέπει και πάλι να εισάγετε ένα μοναδικό κενό διάστημα ή μια μετατόπιση θέσης μετά τον τύπο."
+msgstr ""
+"Εισάγετε ένα μοναδικό κενό (space) ή μια μοναδική μετατόπιση θέσης (tab) "
+"ανάμεσα σε έναν τύπο και την τιμή του: οποιοδήποτε επιπλέον κενό διάστημα "
+"(whitespace) θα ερμηνευθεί σαν να ανήκει στην τιμή. Ακόμα κι αν "
+"προσδιορίσετε μια κενή τιμή θα πρέπει και πάλι να εισάγετε ένα μοναδικό κενό "
+"διάστημα ή μια μετατόπιση θέσης μετά τον τύπο."
 
 #. Tag: para
 #: preseed.xml:579
 #, no-c-format
-#| msgid ""
-#| "A line can be split into multiple lines by appending a backslash "
-#| "(<quote><literal>\\</literal></quote>) as the line continuation "
-#| "character. A good place to split a line is after the question name; a bad "
-#| "place is between type and value."
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
@@ -1127,8 +1127,12 @@ msgid ""
 "between type and value. Splitting a line inside the value is normally not "
 "supported, with the exception of partitioning recipes."
 msgstr ""
-"Μια γραμμή μπορεί να χωριστεί σε πολλαπλές γραμμές με την προσθήκη στο τέλος του συμβόλου backslash (<quote><literal>\\</literal></quote>) σαν χαρακτήρα "
-"συνέχισης της γραμμής. Ένα καλό σημείο για να χωρίσετε μια γραμμή είναι αμέσως μετά το όνομα της ερώτησης. Ένα κακό σημείο είναι ανάμεσα σε έναν τύπο και την τιμή του. Ο χωρισμός της γραμμής μέσα στο πεδίο μιας τιμής κανονικά δεν υποστηρίζεται, με την εξαίρεση των συνταγών διαμέρισης."
+"Μια γραμμή μπορεί να χωριστεί σε πολλαπλές γραμμές με την προσθήκη στο τέλος "
+"του συμβόλου backslash (<quote><literal>\\</literal></quote>) σαν χαρακτήρα "
+"συνέχισης της γραμμής. Ένα καλό σημείο για να χωρίσετε μια γραμμή είναι "
+"αμέσως μετά το όνομα της ερώτησης. Ένα κακό σημείο είναι ανάμεσα σε έναν "
+"τύπο και την τιμή του. Ο χωρισμός της γραμμής μέσα στο πεδίο μιας τιμής "
+"κανονικά δεν υποστηρίζεται, με την εξαίρεση των συνταγών διαμέρισης."
 
 #. Tag: para
 #: preseed.xml:586
@@ -1466,7 +1470,8 @@ msgstr "killall.sh; netcfg"
 #: preseed.xml:750
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
-msgstr "Οι επόμενες μεταβλητές του debconf είναι συναφείς με την ρύθμιση του δικτύου."
+msgstr ""
+"Οι επόμενες μεταβλητές του debconf είναι συναφείς με την ρύθμιση του δικτύου."
 
 #. Tag: screen
 #: preseed.xml:756
@@ -2190,7 +2195,8 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:905
 #, no-c-format
-msgid "The following command can be used to generate an MD5 hash for a password:"
+msgid ""
+"The following command can be used to generate an MD5 hash for a password:"
 msgstr ""
 "Η επόμενη εντολή μπορεί να χρησιμοποιηθεί για την παραγωγή ενός κλειδιού "
 "(hash) MD5 για ένα συνθηματικό χρήστη:"
@@ -2837,4 +2843,3 @@ msgstr ""
 "προρύθμισης, που σημαίνει για παράδειγμα ότι έχετε άλλη μια ευκαιρία να "
 "εκτελέσετε την εντολή preseed/early, με την δεύτερη να προκύπτει όταν το "
 "δίκτυο έχει ανέβει."
-
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 4c70a6762..0b4d2d7f5 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1071,9 +1071,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:574
 #, no-c-format
-#| msgid ""
-#| "Put only a single space or tab between type and value: any additional "
-#| "whitespace will be interpreted as belonging to the value."
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value. If you specify an "
@@ -1087,11 +1084,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:579
 #, no-c-format
-#| msgid ""
-#| "A line can be split into multiple lines by appending a backslash "
-#| "(<quote><literal>\\</literal></quote>) as the line continuation "
-#| "character. A good place to split a line is after the question name; a bad "
-#| "place is between type and value."
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
@@ -1099,11 +1091,12 @@ msgid ""
 "between type and value. Splitting a line inside the value is normally not "
 "supported, with the exception of partitioning recipes."
 msgstr ""
-"Uma linha pode ser dividida em várias linhas acrescentando uma 'backslash' "
-"(<quote><literal>\\</literal></quote>) como caractere de continuação da "
-"linha. Um bom lugar para dividir uma linha é após o nome da questão; um mau "
-"lugar é entre o tipo e o valor. Dividir uma linha dentro do valor normalmente "
-"não é suportado, com a excepção de receitas de particionamento."
+"Uma linha pode ser dividida em várias linhas acrescentando uma "
+"'backslash' (<quote><literal>\\</literal></quote>) como caractere de "
+"continuação da linha. Um bom lugar para dividir uma linha é após o nome da "
+"questão; um mau lugar é entre o tipo e o valor. Dividir uma linha dentro do "
+"valor normalmente não é suportado, com a excepção de receitas de "
+"particionamento."
 
 #. Tag: para
 #: preseed.xml:586
diff --git a/po/ru/hardware.po b/po/ru/hardware.po
index 0e5b550dd..83c8c2ef3 100644
--- a/po/ru/hardware.po
+++ b/po/ru/hardware.po
@@ -13,7 +13,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: hardware.xml:5
@@ -78,9 +79,6 @@ msgstr "Поддерживаемые архитектуры"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "Debian &release; supports twelve major architectures and several "
-#| "variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "Debian &release; supports eleven major architectures and several variations "
 "of each architecture known as <quote>flavors</quote>."
@@ -152,7 +150,6 @@ msgstr "alpha"
 #. Tag: entry
 #: hardware.xml:81
 #, no-c-format
-#| msgid "<entry>VME</entry>"
 msgid "<entry>ARM</entry>"
 msgstr "<entry>ARM</entry>"
 
@@ -183,7 +180,6 @@ msgstr "armel"
 #. Tag: entry
 #: hardware.xml:87
 #, no-c-format
-#| msgid "<entry>prep</entry>"
 msgid "<entry>Versatile</entry>"
 msgstr "<entry>Versatile</entry>"
 
@@ -2020,18 +2016,18 @@ msgid ""
 "\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url=\"&url-arm-cyrius-"
 "qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)."
 msgstr ""
-"Orion &mdash; это система в микросхеме (SoC) производства Marvell, где в один "
-"чип встроены процессор ARM, Ethernet, SATA, USB и другие элементы. На рынке имеется "
-"много устройств сетевых хранилищ (NAS), в которых используется Orion. "
-"В данный момент поддерживаются следующие устройства, основывающиеся на "
-"Orion: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
-"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url=\"&url-arm-cyrius-"
-"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 и TS-409)."
+"Orion &mdash; это система в микросхеме (SoC) производства Marvell, где в "
+"один чип встроены процессор ARM, Ethernet, SATA, USB и другие элементы. На "
+"рынке имеется много устройств сетевых хранилищ (NAS), в которых используется "
+"Orion. В данный момент поддерживаются следующие устройства, основывающиеся "
+"на Orion: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</"
+"ulink>, <ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url="
+"\"&url-arm-cyrius-qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 и TS-"
+"409)."
 
 #. Tag: term
 #: hardware.xml:820
 #, no-c-format
-#| msgid "<term>prep</term>"
 msgid "<term>Versatile</term>"
 msgstr "<term>Versatile</term>"
 
@@ -2042,8 +2038,8 @@ msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run Debian on ARM if you don't have the hardware."
 msgstr ""
-"Платформа Versatile эмулируется QEMU и поэтому замечательно подходит "
-"для тестирования и запуска Debian на ARM, если у вас нет такой аппаратуры."
+"Платформа Versatile эмулируется QEMU и поэтому замечательно подходит для "
+"тестирования и запуска Debian на ARM, если у вас нет такой аппаратуры."
 
 #. Tag: para
 #: hardware.xml:840
@@ -2138,12 +2134,6 @@ msgstr "Шина ввода-вывода (I/O)"
 #. Tag: para
 #: hardware.xml:918
 #, no-c-format
-#| msgid ""
-#| "The system bus is the part of the motherboard which allows the CPU to "
-#| "communicate with peripherals such as storage devices. Your computer must "
-#| "use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used in IBM's "
-#| "PS/2 line), or VESA Local Bus (VLB, sometimes called the VL bus). "
-#| "Essentially all personal computers sold in recent years use one of these."
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
@@ -2153,9 +2143,9 @@ msgid ""
 msgstr ""
 "Системная шина &mdash; это часть материнской платы, которая позволяет "
 "процессору взаимодействовать с периферией, например, с устройствами "
-"хранения. Ваш компьютер должен использовать ISA, EISA, PCI, PCIe или VESA Local Bus "
-"(VLB, иногда называемая VL шиной). В сущности, все персональные компьютеры, "
-"продаваемые в последние годы, имеют одну из них."
+"хранения. Ваш компьютер должен использовать ISA, EISA, PCI, PCIe или VESA "
+"Local Bus (VLB, иногда называемая VL шиной). В сущности, все персональные "
+"компьютеры, продаваемые в последние годы, имеют одну из них."
 
 #. Tag: para
 #: hardware.xml:941
@@ -2215,23 +2205,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:983
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91250A (SWARM): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the dual-core SB1 1250 CPU. </"
-#| "para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): this is an "
-#| "ATX form factor evaluation board from Broadcom based on the quad-core "
-#| "SB1A 1480 CPU. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -2258,18 +2231,17 @@ msgstr ""
 "относятся также к Indigo 2 и Challenge S. </para></listitem> "
 "<listitem><para> SGI IP32: известна также как SGI O2. </para></listitem> "
 "<listitem><para> MIPS Malta: данная платформа эмулируется QEMU и поэтому "
-"замечательно подходит для тестирования и запуска Debian на MIPS, если "
-"у вас нет такого аппаратного обеспечения. </para></listitem> "
-"<listitem><para> Broadcom BCM91250A (SWARM): это плата с размером "
-"ATX от Broadcom на основе двухядерных процессоров SB1 1250. </para></"
-"listitem> <listitem><para> Broadcom BCM91480B (BigSur): это плата с размером "
-"ATX от Broadcom на основе четырёхядерных процессоров SB1A 1480. </para></"
-"listitem> </itemizedlist> Полную информацию о поддерживаемых машинах mips/"
-"mipsel можно найти на <ulink url=\"&url-linux-mips;\">домашней странице "
-"Linux-MIPS</ulink>. Далее будут описываться только системы, поддерживаемые "
-"программой установки Debian. Если вам нужна поддержка других субархитектур, "
-"напишите в <ulink url=\"&url-list-subscribe;\">список рассылки debian-&arch-"
-"listname;</ulink>."
+"замечательно подходит для тестирования и запуска Debian на MIPS, если у вас "
+"нет такого аппаратного обеспечения. </para></listitem> <listitem><para> "
+"Broadcom BCM91250A (SWARM): это плата с размером ATX от Broadcom на основе "
+"двухядерных процессоров SB1 1250. </para></listitem> <listitem><para> "
+"Broadcom BCM91480B (BigSur): это плата с размером ATX от Broadcom на основе "
+"четырёхядерных процессоров SB1A 1480. </para></listitem> </itemizedlist> "
+"Полную информацию о поддерживаемых машинах mips/mipsel можно найти на <ulink "
+"url=\"&url-linux-mips;\">домашней странице Linux-MIPS</ulink>. Далее будут "
+"описываться только системы, поддерживаемые программой установки Debian. Если "
+"вам нужна поддержка других субархитектур, напишите в <ulink url=\"&url-list-"
+"subscribe;\">список рассылки debian-&arch-listname;</ulink>."
 
 #. Tag: para
 #: hardware.xml:1030
@@ -2283,12 +2255,12 @@ msgid ""
 "Similarly, the BCM91480B evaluation board contains an SB1A 1480 chip with "
 "four cores which are supported in SMP mode."
 msgstr ""
-"В настоящий момент, SGI IP22, SGI Indy, Indigo 2 и Challenge S с процессорами "
-"R4000, R4400, R4600 и R5000 поддерживаются системой установки Debian как "
-"MIPS с прямым порядком байт. Плата Broadcom BCM91250A комплектуется "
-"микросхемой SB1 1250 с двумя ядрами и поддерживается программой установки в "
-"режиме SMP. Также, плата BCM91480B комплектуется микросхемой SB1A 1480 с "
-"четырьмя ядрами и поддерживается в режиме SMP."
+"В настоящий момент, SGI IP22, SGI Indy, Indigo 2 и Challenge S с "
+"процессорами R4000, R4400, R4600 и R5000 поддерживаются системой установки "
+"Debian как MIPS с прямым порядком байт. Плата Broadcom BCM91250A "
+"комплектуется микросхемой SB1 1250 с двумя ядрами и поддерживается "
+"программой установки в режиме SMP. Также, плата BCM91480B комплектуется "
+"микросхемой SB1A 1480 с четырьмя ядрами и поддерживается в режиме SMP."
 
 #. Tag: para
 #: hardware.xml:1040
@@ -2305,21 +2277,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1057
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
-#| "RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> "
-#| "Broadcom BCM91250A (SWARM): this is an ATX form factor evaluation board "
-#| "from Broadcom based on the dual-core SB1 1250 CPU. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91480B (BigSur): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the quad-core SB1A 1480 CPU. </"
-#| "para></listitem> </itemizedlist> Complete information regarding supported "
-#| "mips/mipsel machines can be found at the <ulink url=\"&url-linux-mips;"
-#| "\">Linux-MIPS homepage</ulink>. In the following, only the systems "
-#| "supported by the Debian installer will be covered. If you are looking for "
-#| "support for other subarchitectures, please contact the <ulink url=\"&url-"
-#| "list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -2341,20 +2298,19 @@ msgstr ""
 "Debian для &arch-title; поддерживает следующие платформы: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: здесь описаны только машины Cobalt на "
 "основе MIPS. Это Cobalt 2700 (Qube1), RaQ, Qube2 и RaQ2, а также Gateway "
-"Microserver. </para></listitem> "
-"<listitem><para> MIPS Malta: данная платформа эмулируется QEMU и поэтому "
-"замечательно подходит для тестирования и запуска Debian на MIPS, если "
-"у вас нет такого аппаратного обеспечения. </para></listitem> "
-"<listitem><para> Broadcom BCM91250A (SWARM): "
-"это плата с размером ATX от Broadcom на основе двухядерных процессоров SB1 "
-"1250. </para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): то "
-"плата с размером ATX от Broadcom на основе четырёхядерных процессоров SB1A "
-"1480. </para></listitem></itemizedlist> Полную информацию о поддерживаемых "
-"машинах mips/mipsel можно найти на <ulink url=\"&url-linux-mips;\">домашней "
-"странице Linux-MIPS</ulink>. Далее будут описываться только системы, "
-"поддерживаемые программой установки Debian. Если вам нужна поддержка других "
-"субархитектур, напишите в <ulink url=\"&url-list-subscribe;\">список "
-"рассылки debian-&arch-listname;</ulink>."
+"Microserver. </para></listitem> <listitem><para> MIPS Malta: данная "
+"платформа эмулируется QEMU и поэтому замечательно подходит для тестирования "
+"и запуска Debian на MIPS, если у вас нет такого аппаратного обеспечения. </"
+"para></listitem> <listitem><para> Broadcom BCM91250A (SWARM): это плата с "
+"размером ATX от Broadcom на основе двухядерных процессоров SB1 1250. </"
+"para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): то плата с "
+"размером ATX от Broadcom на основе четырёхядерных процессоров SB1A 1480. </"
+"para></listitem></itemizedlist> Полную информацию о поддерживаемых машинах "
+"mips/mipsel можно найти на <ulink url=\"&url-linux-mips;\">домашней странице "
+"Linux-MIPS</ulink>. Далее будут описываться только системы, поддерживаемые "
+"программой установки Debian. Если вам нужна поддержка других субархитектур, "
+"напишите в <ulink url=\"&url-list-subscribe;\">список рассылки debian-&arch-"
+"listname;</ulink>."
 
 #. Tag: title
 #: hardware.xml:1098
@@ -2403,8 +2359,8 @@ msgid ""
 "For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
 "subarchitectures are supported."
 msgstr ""
-"В &debian; &release; поддерживаются только субархитектуры PMac (Power-Macintosh или "
-"PowerMac) и PreP."
+"В &debian; &release; поддерживаются только субархитектуры PMac (Power-"
+"Macintosh или PowerMac) и PreP."
 
 #. Tag: title
 #: hardware.xml:1150
@@ -2415,9 +2371,6 @@ msgstr "Варианты ядер"
 #. Tag: para
 #: hardware.xml:1152
 #, no-c-format
-#| msgid ""
-#| "There are four flavours of the powerpc kernel in Debian, based on the CPU "
-#| "type:"
 msgid ""
 "There are two flavours of the powerpc kernel in Debian, based on the CPU "
 "type:"
@@ -2887,7 +2840,6 @@ msgstr "B164"
 #. Tag: title
 #: hardware.xml:1430
 #, no-c-format
-#| msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgid "CHRP subarchitecture (unsupported)"
 msgstr "Субархитектура CHRP (не поддерживается)"
 
@@ -2912,7 +2864,6 @@ msgstr "Pegasos I, Pegasos II"
 #. Tag: title
 #: hardware.xml:1459
 #, no-c-format
-#| msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgid "APUS subarchitecture (unsupported)"
 msgstr "Субархитектура APUS (не поддерживается)"
 
@@ -3155,11 +3106,6 @@ msgstr "Ноутбуки"
 #. Tag: para
 #: hardware.xml:1650
 #, no-c-format
-#| msgid ""
-#| "Laptops are also supported. Laptops are often specialized or contain "
-#| "proprietary hardware. To see if your particular laptop works well with "
-#| "GNU/Linux, see the <ulink url=\"&url-x86-laptop;\">Linux Laptop pages</"
-#| "ulink>"
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
 "case a laptop contains specialized or proprietary hardware, some specific "
@@ -3167,11 +3113,11 @@ msgid ""
 "with GNU/Linux, see for example the <ulink url=\"&url-x86-laptop;\">Linux "
 "Laptop pages</ulink>."
 msgstr ""
-"Ноутбуки также поддерживаются и сегодня большинство из них "
-"Если в них содержится специализированное или проприетарное оборудование, то "
-"некоторые возможности могут не поддерживаться. На странице "
-"<ulink url=\"&url-x86-laptop;\">Linux на ноутбуках</ulink> можно посмотреть, "
-"будет ли работать GNU/Linux на вашем ноутбуке."
+"Ноутбуки также поддерживаются и сегодня большинство из них Если в них "
+"содержится специализированное или проприетарное оборудование, то некоторые "
+"возможности могут не поддерживаться. На странице <ulink url=\"&url-x86-"
+"laptop;\">Linux на ноутбуках</ulink> можно посмотреть, будет ли работать GNU/"
+"Linux на вашем ноутбуке."
 
 # index.docbook:1600, index.docbook:1625, index.docbook:1648
 #. Tag: title
@@ -3183,13 +3129,6 @@ msgstr "Несколько процессоров"
 #. Tag: para
 #: hardware.xml:1663
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image was compiled "
-#| "with SMP support. This should not prevent installation, since the SMP "
-#| "kernel should boot on non-SMP systems; the kernel will simply cause a bit "
-#| "more overhead."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -3201,9 +3140,9 @@ msgstr ""
 "На этой архитектуре поддерживается нескольких процессоров &mdash; так "
 "называемая <quote>симметричная многопроцессорная обработка (symmetric multi-"
 "processing)</quote> или SMP. Стандартное ядро Debian &release; собрано с "
-"поддержкой SMP. Оно также работает на не-SMP системах, но может "
-"может привести к небольшой потери производительности. В обычных "
-"системах это едва ли будет заметно."
+"поддержкой SMP. Оно также работает на не-SMP системах, но может может "
+"привести к небольшой потери производительности. В обычных системах это едва "
+"ли будет заметно."
 
 #. Tag: para
 #: hardware.xml:1672
@@ -3225,13 +3164,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1687
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image was compiled "
-#| "with <firstterm>SMP-alternatives</firstterm> support. This means that the "
-#| "kernel will detect the number of processors (or processor cores) and will "
-#| "automatically deactivate SMP on uniprocessor systems."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -3576,12 +3508,6 @@ msgstr "Карты для беспроводных сетей"
 #. Tag: para
 #: hardware.xml:1910
 #, no-c-format
-#| msgid ""
-#| "Wireless NICs are in general supported as well, with one big proviso. A "
-#| "lot of wireless adapters require drivers that are either non-free or have "
-#| "not been accepted into the official Linux kernel. These NICs can "
-#| "generally be made to work under &debian;, but are not supported during "
-#| "the installation."
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
 "wireless adapters is supported by the official Linux kernel, although many "
@@ -3590,10 +3516,10 @@ msgid ""
 "&debian;, but are not supported during the installation."
 msgstr ""
 "Беспроводные сети, в основном, поддерживаются, как и растёт число "
-"поддерживаемых беспроводных адаптеров в официальном ядре Linux, хотя для работы "
-"многих из них требуется загрузка микропрограммы. Беспроводные адаптеры, не "
-"поддерживаемые официальным ядром Linux, обычно, можно заставить работать "
-"в &debian;, но это не поддерживается во время установки."
+"поддерживаемых беспроводных адаптеров в официальном ядре Linux, хотя для "
+"работы многих из них требуется загрузка микропрограммы. Беспроводные "
+"адаптеры, не поддерживаемые официальным ядром Linux, обычно, можно заставить "
+"работать в &debian;, но это не поддерживается во время установки."
 
 #. Tag: para
 #: hardware.xml:1918
@@ -4609,4 +4535,3 @@ msgstr ""
 #, no-c-format
 msgid "FIXME: is this still true?"
 msgstr "FIXME: это всё ещё верно?"
-
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 77879b6d9..c0701aeb7 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1575,13 +1575,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1141
 #, no-c-format
-#| msgid ""
-#| "If you wish or need to add any boot parameters for either the installer "
-#| "or the kernel, press &tabkey;. This will display the default boot command "
-#| "for the selected menu entry and allow to add additional options. The help "
-#| "screens (see below) list some common possible options. Press &enterkey; "
-#| "to boot the installer with your options; pressing &escapekey; will return "
-#| "you to the boot menu."
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
 "the kernel, press &tabkey;. This will display the default boot command for "
@@ -1589,7 +1582,11 @@ msgid ""
 "screens (see below) list some common possible options. Press &enterkey; to "
 "boot the installer with your options; pressing &escapekey; will return you "
 "to the boot menu and undo any changes you made."
-msgstr "如果您希望或者需要添加引导参数给安装程序或内核，按下 &tabkey;。将显示对应菜单项的默认引导命令，并允许添加额外的选项。帮助界面(下方)列出一些可能的选项。按下 &enterkey; 将使用您的选项引导安装程序；按下 &escapekey; 返回引导菜单并放弃您所做的修改。"
+msgstr ""
+"如果您希望或者需要添加引导参数给安装程序或内核，按下 &tabkey;。将显示对应菜单"
+"项的默认引导命令，并允许添加额外的选项。帮助界面(下方)列出一些可能的选项。按"
+"下 &enterkey; 将使用您的选项引导安装程序；按下 &escapekey; 返回引导菜单并放弃"
+"您所做的修改。"
 
 #. Tag: para
 #: boot-installer.xml:1150
@@ -4858,19 +4855,18 @@ msgid ""
 "by using <userinput>vga=ask</userinput>, but you should be aware that list "
 "may not be complete. </para> </footnote> may help. If that does not work, "
 "try adding the boot parameter <userinput>fb=false</userinput>."
-msgstr "一些系统(特别是便携机)具有非 4:3 的原始比例(也就是那些非 800x600 或 1024x768)，在安装程序启动之后出现屏幕空白。这种情况下，在 boot 参数后加上 <userinput>vga=788</userinput><footnote> <para> 该参数 <userinput>vga=788</userinput> 激活 VESA framebuffer 的 800x600 分辨率。它可能有效，但也可能不适用于您的系统。使用 <userinput>vga=ask</userinput> 可以列出所支持的分辨率，但要注意该列表可能不全。</para> </footnote> 可能解决问题。如果还不行，试试 boot 参数 <userinput>fb=false</userinput>。"
+msgstr ""
+"一些系统(特别是便携机)具有非 4:3 的原始比例(也就是那些非 800x600 或 "
+"1024x768)，在安装程序启动之后出现屏幕空白。这种情况下，在 boot 参数后加上 "
+"<userinput>vga=788</userinput><footnote> <para> 该参数 <userinput>vga=788</"
+"userinput> 激活 VESA framebuffer 的 800x600 分辨率。它可能有效，但也可能不适"
+"用于您的系统。使用 <userinput>vga=ask</userinput> 可以列出所支持的分辨率，但"
+"要注意该列表可能不全。</para> </footnote> 可能解决问题。如果还不行，试试 "
+"boot 参数 <userinput>fb=false</userinput>。"
 
 #. Tag: para
 #: boot-installer.xml:3741
 #, no-c-format
-#| msgid ""
-#| "If your screen begins to show a weird picture while the kernel boots, eg. "
-#| "pure white, pure black or colored pixel garbage, your system may contain "
-#| "a problematic video card which does not switch to the framebuffer mode "
-#| "properly. Then you can use the boot parameter <userinput>fb=false "
-#| "video=vga16:off</userinput> to disable the framebuffer console. Only a "
-#| "reduced set of languages will be available during the installation due to "
-#| "limited console features. See <xref linkend=\"boot-parms\"/> for details."
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
 "pure white, pure black or colored pixel garbage, your system may contain a "
@@ -4879,7 +4875,12 @@ msgid ""
 "userinput> to disable the framebuffer console. Only a reduced set of "
 "languages will be available during the installation due to limited console "
 "features. See <xref linkend=\"boot-parms\"/> for details."
-msgstr "如果您的显示屏在内核引导的时候显示一个奇怪的图片(比如，纯白、纯黑或者彩色的像素块)，系统可能含有一块有问题的显示卡。它不能切换至 framebuffer 模式。您可以使用引导参数 <userinput>fb=false</userinput> 来禁止使用 framebuffer 控制台。由于控制台的限制，在安装过程中只能使用少数的几种语言，参阅 <xref linkend=\"boot-parms\"/> 来获得细节信息。"
+msgstr ""
+"如果您的显示屏在内核引导的时候显示一个奇怪的图片(比如，纯白、纯黑或者彩色的像"
+"素块)，系统可能含有一块有问题的显示卡。它不能切换至 framebuffer 模式。您可以"
+"使用引导参数 <userinput>fb=false</userinput> 来禁止使用 framebuffer 控制台。"
+"由于控制台的限制，在安装过程中只能使用少数的几种语言，参阅 <xref linkend="
+"\"boot-parms\"/> 来获得细节信息。"
 
 #. Tag: title
 #: boot-installer.xml:3755
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 5ebd3165a..68fd67f9c 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -428,19 +428,17 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:248
 #, no-c-format
-#| msgid ""
-#| "Now it is time to partition your disks. First you will be given the "
-#| "opportunity to automatically partition either an entire drive, or "
-#| "available free space on a drive (guided partitioning). This is "
-#| "recommended for new users or anyone in a hurry. If you do not want to "
-#| "autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu."
 msgid ""
 "Now it is time to partition your disks. First you will be given the "
 "opportunity to automatically partition either an entire drive, or available "
 "free space on a drive (see <xref linkend=\"partman-auto\"/>). This is "
 "recommended for new users or anyone in a hurry. If you do not want to "
 "autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu."
-msgstr "现在该对硬盘分区了。首先，您可以选择对整个驱动器，或是对已有的空闲空间进行自动分区(参阅 <xref linkend=\"partman-auto\"/>)。对于新手或者急于使用的朋友推荐使用这种方式。如果不想用自动分区，请在菜单中选择 <guimenuitem>Manual</guimenuitem>。"
+msgstr ""
+"现在该对硬盘分区了。首先，您可以选择对整个驱动器，或是对已有的空闲空间进行自"
+"动分区(参阅 <xref linkend=\"partman-auto\"/>)。对于新手或者急于使用的朋友推荐"
+"使用这种方式。如果不想用自动分区，请在菜单中选择 <guimenuitem>Manual</"
+"guimenuitem>。"
 
 #. Tag: para
 #: installation-howto.xml:256
@@ -459,15 +457,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:263
 #, no-c-format
-#| msgid ""
-#| "On the next screen you will see your partition table, how the partitions "
-#| "will be formatted, and where they will be mounted. Select a partition to "
-#| "modify or delete it. If you did automatic partitioning, you should just "
-#| "be able to choose <guimenuitem>Finish partitioning and write changes to "
-#| "disk</guimenuitem> from the menu to use what it set up. Remember to "
-#| "assign at least one partition for swap space and to mount a partition on "
-#| "<filename>/</filename>. <xref linkend=\"partitioning\"/> has more "
-#| "information about partitioning."
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
 "will be formatted, and where they will be mounted. Select a partition to "
@@ -478,7 +467,14 @@ msgid ""
 "filename>. For more detailed information on how to use the partitioner, "
 "please refer to <xref linkend=\"di-partition\"/>; the appendix <xref linkend="
 "\"partitioning\"/> has more general information about partitioning."
-msgstr "在接下来的屏幕上，您可以看到自己的分区表，各分区将以何种方式格式化，以及它们将来的挂载点在何处。选择一个分区进行修改或删除。如果您先前选择的是自动分区，那么现在只需从菜单选择 <guimenuitem>Finish partitioning and write changes to disk</guimenuitem>，使用它创建的即可。请不要忘记至少需要分配一个分区作为交换空间，以及把一个分区挂载到 <filename>/</filename>上。有关使用分区工具详尽的资料，请参考 <xref linkend=\"di-partition\"/>； 附录 <xref linkend=\"partitioning\"/> 有更多关于分区方面的信息。"
+msgstr ""
+"在接下来的屏幕上，您可以看到自己的分区表，各分区将以何种方式格式化，以及它们"
+"将来的挂载点在何处。选择一个分区进行修改或删除。如果您先前选择的是自动分区，"
+"那么现在只需从菜单选择 <guimenuitem>Finish partitioning and write changes to "
+"disk</guimenuitem>，使用它创建的即可。请不要忘记至少需要分配一个分区作为交换"
+"空间，以及把一个分区挂载到 <filename>/</filename>上。有关使用分区工具详尽的资"
+"料，请参考 <xref linkend=\"di-partition\"/>； 附录 <xref linkend="
+"\"partitioning\"/> 有更多关于分区方面的信息。"
 
 #. Tag: para
 #: installation-howto.xml:276
@@ -513,16 +509,14 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:293
 #, no-c-format
-#| msgid ""
-#| "Partitioning is followed by setting up user accounts. By default you will "
-#| "need to provide a password for the <quote>root</quote> (administrator) "
-#| "account and information necessary to create one regular user account."
 msgid ""
 "Installation of the base system is followed by setting up user accounts. By "
 "default you will need to provide a password for the <quote>root</quote> "
 "(administrator) account and information necessary to create one regular user "
 "account."
-msgstr "安装基本系统之后是建立用户帐号。默认情况下，您需要为 <quote>root</quote> (管理员) 帐号设置密码，并建立一个普通用户帐号。"
+msgstr ""
+"安装基本系统之后是建立用户帐号。默认情况下，您需要为 <quote>root</quote> (管"
+"理员) 帐号设置密码，并建立一个普通用户帐号。"
 
 #. Tag: para
 #: installation-howto.xml:300
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 6ef58dd76..35c49dd5b 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -957,30 +957,27 @@ msgstr "编写预置文件的时候要留意几条规则。"
 #. Tag: para
 #: preseed.xml:574
 #, no-c-format
-#| msgid ""
-#| "Put only a single space or tab between type and value: any additional "
-#| "whitespace will be interpreted as belonging to the value."
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value. If you specify an "
 "empty value you should still put a single space or tab after the type."
-msgstr "在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。如果您设置空值，仍需要在其后加一个空格或 tab。"
+msgstr ""
+"在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。如果"
+"您设置空值，仍需要在其后加一个空格或 tab。"
 
 #. Tag: para
 #: preseed.xml:579
 #, no-c-format
-#| msgid ""
-#| "A line can be split into multiple lines by appending a backslash "
-#| "(<quote><literal>\\</literal></quote>) as the line continuation "
-#| "character. A good place to split a line is after the question name; a bad "
-#| "place is between type and value."
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
 "good place to split a line is after the question name; a bad place is "
 "between type and value. Splitting a line inside the value is normally not "
 "supported, with the exception of partitioning recipes."
-msgstr "一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多行。分割一行较好的地方是在问题名后面；而在类型和值之间则是糟糕的地方。在值中间换行通常不支持，例外的情况是分区表。"
+msgstr ""
+"一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多"
+"行。分割一行较好的地方是在问题名后面；而在类型和值之间则是糟糕的地方。在值中"
+"间换行通常不支持，例外的情况是分区表。"
 
 #. Tag: para
 #: preseed.xml:586
@@ -1172,17 +1169,14 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:695
 #, no-c-format
-#| msgid ""
-#| "Keyboard configuration consists of selecting a keyboard architecture and "
-#| "a keymap. In most cases the correct keyboard architecture is selected by "
-#| "default, so there's normally no need to preseed it. The keymap must be "
-#| "valid for the selected keyboard architecture."
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
 "keymap. In most cases the correct keyboard architecture is selected by "
 "default, so there's normally no need to preseed it. The keymap must be known "
 "to the &d-i; for the selected keyboard architecture."
-msgstr "键盘设置由键盘体系和 keymap 组成。大多数情况下，默认可以选择正确的键盘体系，因此通常不必预置。keymap 必须对 &d-i; 所选择的键盘体系有效。"
+msgstr ""
+"键盘设置由键盘体系和 keymap 组成。大多数情况下，默认可以选择正确的键盘体系，"
+"因此通常不必预置。keymap 必须对 &d-i; 所选择的键盘体系有效。"
 
 #. Tag: screen
 #: preseed.xml:702
@@ -1532,76 +1526,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:831
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "#d-i partman-auto/init_automatically_partition \\\n"
-#| "#      select Guided - use the largest continuous free space\n"
-#| "\n"
-#| "# Alternatively, you can specify a disk to partition. The device name "
-#| "must\n"
-#| "# be given in traditional non-devfs format.\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "# Note: A disk must be specified, unless the system has only one disk.\n"
-#| "#d-i partman-auto/disk string /dev/sda\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are: \"regular\", \"lvm\" and \"crypto"
-#| "\"\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "\n"
-#| "# You can choose from any of the predefined partitioning recipes.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "d-i partman-auto/choose_recipe \\\n"
-#| "       select All files in one partition (recommended for new users)\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home partition\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home, /usr, /var, and /tmp partitions\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# The recipe format is documented in the file devel/partman-auto-recipe."
-#| "txt.\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string                         \\\n"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "#d-i partman-auto/init_automatically_partition select biggest_free\n"
@@ -1692,12 +1616,14 @@ msgstr ""
 "d-i partman-auto/choose_recipe select atomic\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\n"
+"# The recipe format is documented in the file devel/partman-auto-recipe."
+"txt.\n"
 "# If you have a way to get a recipe file into the d-i environment, you can\n"
 "# just point at it.\n"
 "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
 "\n"
-"# If not, you can put an entire recipe into the preconfiguration file in one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in "
+"one\n"
 "# (logical) line. This example creates a small /boot partition, suitable\n"
 "# swap, and uses the rest of the space for the root partition:\n"
 "#d-i partman-auto/expert_recipe string                         \\\n"
@@ -1746,74 +1672,20 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:847
 #, no-c-format
-#| msgid ""
-#| "This type of automated partitioning is easy to get wrong. It is also a "
-#| "very new component that may still have some bugs or missing error "
-#| "handling. The responsibility to get the various recipes right (so they "
-#| "make sense and don't conflict) lies with the user. Check <filename>/var/"
-#| "log/syslog</filename> if you run into problems."
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
 "functionality that receives relatively little testing from the developers of "
 "&d-i;. The responsibility to get the various recipes right (so they make "
 "sense and don't conflict) lies with the user. Check <filename>/var/log/"
 "syslog</filename> if you run into problems."
-msgstr "这种自动分区方式很容易出错。&d-i; 开发人员对它的功能只进行了相对较少的测试。让各种方案正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查一下 <filename>/var/log/syslog</filename>。"
+msgstr ""
+"这种自动分区方式很容易出错。&d-i; 开发人员对它的功能只进行了相对较少的测试。"
+"让各种方案正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查一下 "
+"<filename>/var/log/syslog</filename>。"
 
 #. Tag: screen
 #: preseed.xml:857
 #, no-c-format
-#| msgid ""
-#| "# NOTE: this option is of beta release quality and should be used "
-#| "carefully\n"
-#| "\n"
-#| "# The method should be set to \"raid\".\n"
-#| "#d-i partman-auto/method string raid\n"
-#| "# Specify the disks to be partitioned. They will all get the same "
-#| "layout,\n"
-#| "# so this will only work if the disks are the same size.\n"
-#| "#d-i partman-auto/disk string /dev/discs/disc0/disc /dev/discs/disc1/"
-#| "disc\n"
-#| "\n"
-#| "# Next you need to specify the physical partitions that will be used. \n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "#      multiraid ::                                         \\\n"
-#| "#              1000 5000 4000 raid                          \\\n"
-#| "#                      $primary{ } method{ raid }           \\\n"
-#| "#              .                                            \\\n"
-#| "#              64 512 300% raid                             \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .                                            \\\n"
-#| "#              500 10000 1000000000 raid                    \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# Last you need to specify how the previously defined partitions will be\n"
-#| "# used in the RAID setup. Remember to use the correct partition numbers\n"
-#| "# for logical partitions.\n"
-#| "# Parameters are:\n"
-#| "# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
-#| "mountpoint&gt; \\\n"
-#| "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-#| "# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated "
-#| "using \"#\"\n"
-#| "#d-i partman-auto-raid/recipe string \\\n"
-#| "#    1 2 0 ext3 /                                           \\\n"
-#| "#          /dev/discs/disc0/part1#/dev/discs/disc1/part1    \\\n"
-#| "#    .                                                      \\\n"
-#| "#    1 2 0 swap -                                           \\\n"
-#| "#          /dev/discs/disc0/part5#/dev/discs/disc1/part5    \\\n"
-#| "#    .                                                      \\\n"
-#| "#    0 2 0 ext3 /home                                       \\\n"
-#| "#          /dev/discs/disc0/part6#/dev/discs/disc1/part6    \\\n"
-#| "#    .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation.\n"
-#| "d-i partman-md/confirm boolean true\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
 "\n"
@@ -1887,9 +1759,11 @@ msgstr ""
 "# used in the RAID setup. Remember to use the correct partition numbers\n"
 "# for logical partitions.\n"
 "# Parameters are:\n"
-"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;mountpoint&gt; \\\n"
+"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
+"mountpoint&gt; \\\n"
 "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-"# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated using \"#\"\n"
+"# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated using "
+"\"#\"\n"
 "#d-i partman-auto-raid/recipe string \\\n"
 "#    1 2 0 ext3 /                                           \\\n"
 "#          /dev/discs/disc0/part1#/dev/discs/disc1/part1    \\\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 68fc1e358..f334dd5bd 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -2350,9 +2350,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:1256
 #, no-c-format
-#| msgid ""
-#| "Information on some screens is not yet nicely formatted into columns as "
-#| "it should be. This is most visible during partitioning."
 msgid ""
 "Information on some screens is not yet nicely formatted into columns as it "
 "should be."
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 875f92877..0c347a95a 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -725,16 +725,6 @@ msgstr "关于版权与软件协议"
 #. Tag: para
 #: welcome.xml:513
 #, no-c-format
-#| msgid ""
-#| "We're sure that you've read some of the licenses that come with most "
-#| "commercial software &mdash; they usually say that you can only use one "
-#| "copy of the software on a single computer. This system's license isn't "
-#| "like that at all. We encourage you to put a copy of on every computer in "
-#| "your school or place of business. Lend your installation media to your "
-#| "friends and help them install it on their computers! You can even make "
-#| "thousands of copies and <emphasis>sell</emphasis> them &mdash; albeit "
-#| "with a few restrictions. Your freedom to install and use the system comes "
-#| "directly from Debian being based on <emphasis>free software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -745,7 +735,13 @@ msgid ""
 "copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
 "restrictions. Your freedom to install and use the system comes directly from "
 "Debian being based on <emphasis>free software</emphasis>."
-msgstr "我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian; 拷贝用到您的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们的计算机上！您甚至可以制作上千份拷贝，然后 <emphasis>出售</emphasis> 它们 &mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 Debian 是基于 <emphasis>自由软件</emphasis>。"
+msgstr ""
+"我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
+"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian; 拷贝用到您"
+"的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们的计"
+"算机上！您甚至可以制作上千份拷贝，然后 <emphasis>出售</emphasis> 它们 "
+"&mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 Debian 是基于 "
+"<emphasis>自由软件</emphasis>。"
 
 #. Tag: para
 #: welcome.xml:526