summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/el/preseed.po25
-rw-r--r--po/fi/preseed.po23
-rw-r--r--po/hu/preseed.po5
-rw-r--r--po/ja/preseed.po23
-rw-r--r--po/ko/preseed.po23
-rw-r--r--po/pot/preseed.pot5
-rw-r--r--po/pt/boot-installer.po60
-rw-r--r--po/pt/install-methods.po36
-rw-r--r--po/pt/preparing.po11
-rw-r--r--po/pt/preseed.po23
-rw-r--r--po/ru/boot-installer.po90
-rw-r--r--po/ru/install-methods.po75
-rw-r--r--po/ru/preparing.po46
-rw-r--r--po/ru/preseed.po23
-rw-r--r--po/sv/preseed.po23
-rw-r--r--po/vi/preseed.po23
-rw-r--r--po/zh_CN/preseed.po23
17 files changed, 291 insertions, 246 deletions
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 6be708c60..9bea8a493 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-06-25 23:29+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -75,7 +75,12 @@ msgid ""
"will behave just the same way as in a normal manual installation. Each "
"question you preseed will (if you got it right!) modify the installation in "
"some way from that baseline."
-msgstr "Δεν είναι απαραίτητο το preseeding. Αν χρησιμοποιήσετε ένα κενό αρχείο προρυθμίσεων, ο εγκαταστάτης θα συμπεριφερθεί όπως θα συμπεριφερόταν σε μια συνηθισμένη εγκατάσταση με το χέρι. Κάθε ερώτηση που θα έχετε προρυθμίσει (αν το κάνετε σωστά) θα τροποποιεί την εγκατάσταση με κάποιο τρόπο σε σχέση με αυτή τη βασική μορφή."
+msgstr ""
+"Δεν είναι απαραίτητο το preseeding. Αν χρησιμοποιήσετε ένα κενό αρχείο "
+"προρυθμίσεων, ο εγκαταστάτης θα συμπεριφερθεί όπως θα συμπεριφερόταν σε μια "
+"συνηθισμένη εγκατάσταση με το χέρι. Κάθε ερώτηση που θα έχετε προρυθμίσει "
+"(αν το κάνετε σωστά) θα τροποποιεί την εγκατάσταση με κάποιο τρόπο σε σχέση "
+"με αυτή τη βασική μορφή."
#. Tag: title
#: preseed.xml:50
@@ -175,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>"
@@ -1081,12 +1087,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 ""
"Υπάρχουν μερικοί κανόνες που θα πρέπει να έχετε στο μυαλό σας όταν γράφετε "
"ένα αρχείο προρύθμισης."
@@ -2139,7 +2147,8 @@ msgstr ""
#. Tag: para
#: preseed.xml:896
#, 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 ""
#. Tag: screen
@@ -2355,6 +2364,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
@@ -2832,4 +2844,3 @@ msgstr ""
"προρύθμισης, που σημαίνει για παράδειγμα ότι έχετε άλλη μια ευκαιρία να "
"εκτελέσετε την εντολή preseed/early, με την δεύτερη να προκύπτει όταν το "
"δίκτυο έχει ανέβει."
-
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 1d1072646..e629aa0ee 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Installation Guide preseed\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-03-07 09:03+0200\n"
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -2263,7 +2263,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2272,6 +2288,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 5d8414e50..eae7b3125 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2007-03-18 19:17+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian\n"
@@ -2188,6 +2188,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 827987fa1..ec809f5ba 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-09 11:34+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: \n"
@@ -2214,7 +2214,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2223,6 +2239,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 517ac206f..b8d6784fa 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed.xml\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-01 05:02+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -2201,7 +2201,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2210,6 +2226,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index d97157951..3b3a81a96 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1288,6 +1288,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+ "# Whether to upgrade packages after debootstrap.\n"
+ "# Allowed values: none, safe-upgrade, full-upgrade\n"
+ "#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po
index 97820f5b6..ef520e10a 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -3436,30 +3436,6 @@ msgstr "Iniciando Macs NewWorld a partir de OpenFirmware"
#. Tag: para
#: boot-installer.xml:2500
#, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. Restart the computer, "
-#| "and immediately (during the chime) hold down the <keycap>Option</keycap>, "
-#| "<keycap>Command (cloverleaf/Apple)</keycap>, <keycap>o</keycap>, and "
-#| "<keycap>f</keycap> keys all together. After a few seconds you will be "
-#| "presented with the Open Firmware prompt. At the prompt, type "
-#| "<informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
"<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -3484,8 +3460,8 @@ msgstr ""
"gz</filename>, <filename>yaboot</filename>, e <filename>yaboot.conf</"
"filename> ao nível da raiz da sua partição HFS na <xref linkend=\"files-"
"newworld\"/>. Terá de arrancar para o OpenFirmware (veja <xref linkend="
-"\"invoking-openfirmware\"/>). Na linha de comandos, escreva <informalexample>"
-"<screen>\n"
+"\"invoking-openfirmware\"/>). Na linha de comandos, escreva "
+"<informalexample><screen>\n"
"0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
"</screen></informalexample> substituindo <replaceable>x</replaceable> pelo "
"número da partição HFS onde os ficheiros do kernel e do yaboot foram "
@@ -3517,14 +3493,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:2539
#, no-c-format
-#| msgid ""
-#| "Make sure you have prepared everything from <xref linkend=\"boot-usb-files"
-#| "\"/>. To boot a Macintosh system from a USB stick, you will need to use "
-#| "the Open Firmware prompt, since Open Firmware does not search USB storage "
-#| "devices by default. To get to the prompt, hold down "
-#| "<keycombo><keycap>Command</keycap> <keycap>Option</keycap> <keycap>o</"
-#| "keycap> <keycap>f</keycap></keycombo> all together while booting (see "
-#| "<xref linkend=\"invoking-openfirmware\"/>)."
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
">. To boot a Macintosh system from a USB stick, you will need to use the "
@@ -3533,9 +3501,9 @@ msgid ""
msgstr ""
"Certifique-se de que preparou tudo a partir da <xref linkend=\"boot-usb-files"
"\"/>. Para iniciar um sistema Macintosh a partir de um stick USB, irá "
-"necessitar de utilizar a linha de comandos do Open Firmware, já que por "
-"pré-definição o Open Firmware não procura dispositivos de armazenamento USB. "
-"Veja <xref linkend=\"invoking-openfirmware\"/>."
+"necessitar de utilizar a linha de comandos do Open Firmware, já que por pré-"
+"definição o Open Firmware não procura dispositivos de armazenamento USB. "
+"Veja <xref linkend=\"invoking-openfirmware\"/>."
#. Tag: para
#: boot-installer.xml:2548
@@ -3620,16 +3588,6 @@ msgstr "Actualmente, sistemas PReP e NewWorld PowerMac suportam netbooting."
#. Tag: para
#: boot-installer.xml:2617
#, no-c-format
-#| msgid ""
-#| "On machines with Open Firmware, such as NewWorld Power Macs, enter the "
-#| "boot monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the "
-#| "command <command>boot enet:0</command>. PReP and CHRP boxes may have "
-#| "different ways of addressing the network. On a PReP machine, you should "
-#| "try <userinput>boot net:<replaceable>server_ipaddr</replaceable>,"
-#| "<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></"
-#| "userinput>. On some PReP systems (e.g. Motorola PowerStack machines) the "
-#| "command <userinput>help boot</userinput> may give a description of syntax "
-#| "and available options."
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
"monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the command "
@@ -3654,11 +3612,11 @@ msgstr ""
"</screen></informalexample> As máquinas PReP and CHRP podem ter diferentes "
"maneiras de endereçar a rede. Numa máquina PReP, você deve tentar "
"<informalexample><screen>\n"
-"boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file"
-"</replaceable>,<replaceable>client_ipaddr</replaceable>\n"
+"boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</"
+"replaceable>,<replaceable>client_ipaddr</replaceable>\n"
"</screen></informalexample>Nalguns sistemas PReP (e.g. máquinas Motorola "
-"PowerStack) o comando <userinput>help boot</userinput> pode dar uma descrição "
-"da sintaxe e as opções disponíveis."
+"PowerStack) o comando <userinput>help boot</userinput> pode dar uma "
+"descrição da sintaxe e as opções disponíveis."
#. Tag: para
#: boot-installer.xml:2645
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index d77dc2be5..c591f0405 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -2109,18 +2109,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:1311
#, no-c-format
-#| msgid ""
-#| "Look in <filename>/etc/inetd.conf</filename> and remember the directory "
-#| "which is used as the argument of <command>in.tftpd</command><footnote> "
-#| "<para> The <userinput>-l</userinput> argument enables some versions of "
-#| "<command>in.tftpd</command> to log all requests to the system logs; this "
-#| "is useful for diagnosing boot errors. </para> </footnote>; you'll need "
-#| "that below. If you've had to change <filename>/etc/inetd.conf</filename>, "
-#| "you'll have to notify the running <command>inetd</command> process that "
-#| "the file has changed. On a Debian machine, run <userinput>/etc/init.d/"
-#| "inetd reload</userinput>; on other machines, find out the process ID for "
-#| "<command>inetd</command>, and run <userinput>kill -HUP <replaceable>inetd-"
-#| "pid</replaceable></userinput>."
msgid ""
"Look in <filename>/etc/inetd.conf</filename> and remember the directory "
"which is used as the argument of <command>in.tftpd</command><footnote> "
@@ -2142,13 +2130,14 @@ msgstr ""
"Debian devem registar os pedidos TFTP nos registos pré-definidos do sistema. "
"Alguns deles suportam um argumento <userinput>-v</userinput> para aumentar o "
"detalhe. No caso de problemas de arranque é recomendado verificar estas "
-"mensagens de registo já que são um bom ponto de partida para diagnosticar "
-"a causa de erros. </para> </footnote>; vai necessitar disso abaixo. Se teve "
-"de alterar o <filename>/etc/inetd.conf</filename>, terá de notificar o "
-"processo <command>inetd</command> em execução que o ficheiro foi alterado. "
-"Numa máquina Debian, execute <userinput>/etc/init.d/inetd reload</userinput>; "
+"mensagens de registo já que são um bom ponto de partida para diagnosticar a "
+"causa de erros. </para> </footnote>; vai necessitar disso abaixo. Se teve de "
+"alterar o <filename>/etc/inetd.conf</filename>, terá de notificar o processo "
+"<command>inetd</command> em execução que o ficheiro foi alterado. Numa "
+"máquina Debian, execute <userinput>/etc/init.d/inetd reload</userinput>; "
"noutras máquinas, procure o ID do processo <command>inetd</command>, e "
-"execute <userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>."
+"execute <userinput>kill -HUP <replaceable>inetd-pid</replaceable></"
+"userinput>."
#. Tag: para
#: install-methods.xml:1331
@@ -2207,13 +2196,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:1363
#, no-c-format
-#| msgid ""
-#| "On NewWorld Power Macintosh machines, you will need to set up the "
-#| "<command>yaboot</command> boot loader as the TFTP boot image. "
-#| "<command>Yaboot</command> will then retrieve the kernel and RAMdisk "
-#| "images via TFTP itself. For net booting, use the <filename>yaboot-netboot."
-#| "conf</filename>. Just rename this to <filename>yaboot.conf</filename> in "
-#| "the TFTP directory."
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
"<command>yaboot</command> boot loader as the TFTP boot image. "
@@ -2222,8 +2204,8 @@ msgid ""
"<filename>netboot/</filename> directory:"
msgstr ""
"Em máquinas Macintosh Power NewWorld, irá necessitar de instalar o gestor de "
-"arranque <command>yaboot</command> como a imagem de arranque TFTP. "
-"O <command>yaboot</command> irá então obter a imagem do kernel e RAMdisk "
+"arranque <command>yaboot</command> como a imagem de arranque TFTP. O "
+"<command>yaboot</command> irá então obter a imagem do kernel e RAMdisk "
"através do próprio TFTP. Irá ter de fazer download dos seguintes ficheiros a "
"partir do directório <filename>netboot/</filename>:"
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index 662bca8c2..86b1d5b5c 100644
--- a/po/pt/preparing.po
+++ b/po/pt/preparing.po
@@ -2877,13 +2877,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:1787
#, no-c-format
-#| msgid ""
-#| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
-#| "<keycombo><keycap>Command</keycap> <keycap>option</keycap> <keycap>O</"
-#| "keycap> <keycap>F</keycap></keycombo> while booting. Generally it will "
-#| "check for these keystrokes after the chime, but the exact timing varies "
-#| "from model to model. See <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> "
-#| "for more hints."
msgid ""
"On &arch-title; Macintoshes, you invoke OpenFirmware with "
"<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </"
@@ -2896,8 +2889,8 @@ msgstr ""
"<keycombo><keycap>Command (trevo/Maça)</keycap> <keycap>Option</keycap> "
"<keycap>o</keycap> <keycap>f</keycap></keycombo> enquanto arranca. "
"Normalmente, após o toque, irá verificar estas combinações de teclas, mas o "
-"momento exacto varia de modelo para modelo. Veja <ulink url=\""
-"&url-netbsd-powerpc-faq;\"></ulink> para mais dicas."
+"momento exacto varia de modelo para modelo. Veja <ulink url=\"&url-netbsd-"
+"powerpc-faq;\"></ulink> para mais dicas."
#. Tag: para
#: preparing.xml:1796
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 5e9b0bdf6..b30704d02 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-09 22:47+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2302,7 +2302,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2311,6 +2327,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po
index 9525541b2..650e5629f 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -14,7 +14,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
#: boot-installer.xml:4
@@ -1077,7 +1078,8 @@ msgstr ""
#: boot-installer.xml:600 boot-installer.xml:770 boot-installer.xml:1241
#: boot-installer.xml:2064 boot-installer.xml:2410 boot-installer.xml:2769
#, no-c-format
-msgid "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
+msgid ""
+"If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
msgstr ""
"При возникновении проблем с загрузкой смотрите <xref linkend=\"boot-"
"troubleshooting\"/>."
@@ -1293,7 +1295,8 @@ msgstr ""
#. Tag: title
#: boot-installer.xml:899
#, no-c-format
-msgid "Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
+msgid ""
+"Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
msgstr ""
"Загрузка из Linux с помощью <command>LILO</command> или <command>GRUB</"
"command>"
@@ -1592,7 +1595,8 @@ msgstr "Сетевая карта с сетевым BootROM"
msgid ""
"It could be that your Network Interface Card provides TFTP boot "
"functionality."
-msgstr "Возможно, что сетевая карта (NIC) предоставляет возможность загрузки по TFTP."
+msgstr ""
+"Возможно, что сетевая карта (NIC) предоставляет возможность загрузки по TFTP."
#. Tag: para
#: boot-installer.xml:1098
@@ -3413,30 +3417,6 @@ msgstr "Загрузка NewWorld Mac из OpenFirmware"
#. Tag: para
#: boot-installer.xml:2500
#, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. Restart the computer, "
-#| "and immediately (during the chime) hold down the <keycap>Option</keycap>, "
-#| "<keycap>Command (cloverleaf/Apple)</keycap>, <keycap>o</keycap>, and "
-#| "<keycap>f</keycap> keys all together. After a few seconds you will be "
-#| "presented with the Open Firmware prompt. At the prompt, type "
-#| "<informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
"<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -3461,8 +3441,8 @@ msgstr ""
"<filename>initrd.gz</filename>, <filename>yaboot</filename> и "
"<filename>yaboot.conf</filename> в корень раздела HFS как описано в <xref "
"linkend=\"files-newworld\"/>. Теперь загрузитесь в Open Firmware (смотрите "
-"<xref linkend=\"invoking-openfirmware\"/>). В приглашении "
-"наберите <informalexample><screen>\n"
+"<xref linkend=\"invoking-openfirmware\"/>). В приглашении наберите "
+"<informalexample><screen>\n"
"0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
"</screen></informalexample> заменив <replaceable>x</replaceable> номером "
"раздела HFS, на котором лежат файлы ядра и yaboot и нажмите &enterkey;. На "
@@ -3487,19 +3467,12 @@ msgstr "Загрузка с карты памяти USB"
#: boot-installer.xml:2533
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
-msgstr "В настоящий момент системы NewWorld PowerMac можно загружать с USB устройств."
+msgstr ""
+"В настоящий момент системы NewWorld PowerMac можно загружать с USB устройств."
#. Tag: para
#: boot-installer.xml:2539
#, no-c-format
-#| msgid ""
-#| "Make sure you have prepared everything from <xref linkend=\"boot-usb-files"
-#| "\"/>. To boot a Macintosh system from a USB stick, you will need to use "
-#| "the Open Firmware prompt, since Open Firmware does not search USB storage "
-#| "devices by default. To get to the prompt, hold down "
-#| "<keycombo><keycap>Command</keycap> <keycap>Option</keycap> <keycap>o</"
-#| "keycap> <keycap>f</keycap></keycombo> all together while booting (see "
-#| "<xref linkend=\"invoking-openfirmware\"/>)."
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
">. To boot a Macintosh system from a USB stick, you will need to use the "
@@ -3509,8 +3482,8 @@ msgstr ""
"Проверьте, что вы сделали всё как написано в <xref linkend=\"boot-usb-files"
"\"/>. Для загрузки системы Macintosh с карт памяти USB нужно использовать "
"приглашение Open Firmware, так как по умолчанию Open Firmware не ищет "
-"загрузочные устройства среди USB носителей. Смотрите <xref linkend=\"invoking-"
-"openfirmware\"/>)."
+"загрузочные устройства среди USB носителей. Смотрите <xref linkend="
+"\"invoking-openfirmware\"/>)."
#. Tag: para
#: boot-installer.xml:2548
@@ -3595,16 +3568,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:2617
#, no-c-format
-#| msgid ""
-#| "On machines with Open Firmware, such as NewWorld Power Macs, enter the "
-#| "boot monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the "
-#| "command <command>boot enet:0</command>. PReP and CHRP boxes may have "
-#| "different ways of addressing the network. On a PReP machine, you should "
-#| "try <userinput>boot net:<replaceable>server_ipaddr</replaceable>,"
-#| "<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></"
-#| "userinput>. On some PReP systems (e.g. Motorola PowerStack machines) the "
-#| "command <userinput>help boot</userinput> may give a description of syntax "
-#| "and available options."
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
"monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the command "
@@ -3624,24 +3587,19 @@ msgid ""
msgstr ""
"На машинах с Open Firmware, например, NewWorld Power Mac, войдите в "
"загрузочный монитор (смотрите <xref linkend=\"invoking-openfirmware\"/>) и "
-"воспользуйтесь командой "
-"<informalexample><screen>\n"
+"воспользуйтесь командой <informalexample><screen>\n"
"0 &gt; boot enet:0\n"
-"</screen></informalexample>"
-"Если она не сработает, то попробуйте добавить имя файла так: "
-"<informalexample><screen>\n"
+"</screen></informalexample>Если она не сработает, то попробуйте добавить имя "
+"файла так: <informalexample><screen>\n"
"0 &gt; boot enet:0,yaboot\n"
-"</screen></informalexample>"
-"Машины PReP и CHRP "
-"могут загружаться по сети другими способами. На машине PReP, вы должны "
-"попробовать "
+"</screen></informalexample>Машины PReP и CHRP могут загружаться по сети "
+"другими способами. На машине PReP, вы должны попробовать "
"<informalexample><screen>\n"
"boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</"
"replaceable>,<replaceable>client_ipaddr</replaceable>\n"
-"</screen></informalexample>"
-"На некоторых PReP системах (например, компьютеры Motorola "
-"PowerStack) по команде <userinput>help boot</userinput> можно получить "
-"описание синтаксиса и допустимые параметры."
+"</screen></informalexample>На некоторых PReP системах (например, компьютеры "
+"Motorola PowerStack) по команде <userinput>help boot</userinput> можно "
+"получить описание синтаксиса и допустимые параметры."
#. Tag: para
#: boot-installer.xml:2645
@@ -4925,7 +4883,8 @@ msgstr "Как изучать и может быть решить проблем
#: boot-installer.xml:3511
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
-msgstr "Если с CD-ROM не удаётся загрузиться, попробуйте способы указанные ниже."
+msgstr ""
+"Если с CD-ROM не удаётся загрузиться, попробуйте способы указанные ниже."
#. Tag: para
#: boot-installer.xml:3516
@@ -5705,4 +5664,3 @@ msgstr ""
"проблема, включая последние увиденные сообщения ядра в случае подвисания "
"ядра. Опишите шаги, которые вы делали, чтобы привести систему в проблемное "
"состояние."
-
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 3d942dece..d0969a9d5 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -14,7 +14,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
#: install-methods.xml:5
@@ -307,7 +308,8 @@ msgstr ""
msgid ""
"All of the m68k images for use with 2.2.x kernels, require the kernel "
"parameter &ramdisksize;."
-msgstr "Все образы ядра версий 2.2.x для m68k требуют параметр ядра &ramdisksize;."
+msgstr ""
+"Все образы ядра версий 2.2.x для m68k требуют параметр ядра &ramdisksize;."
#. Tag: title
#: install-methods.xml:248
@@ -360,7 +362,8 @@ msgstr ""
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
"drives."
-msgstr "Загрузка программы установки с дискет не работает в дисководах Mac USB."
+msgstr ""
+"Загрузка программы установки с дискет не работает в дисководах Mac USB."
#. Tag: para
#: install-methods.xml:285
@@ -368,7 +371,8 @@ msgstr "Загрузка программы установки с дискет
msgid ""
"Booting the installer from floppy disk is not supported on Amigas or 68k "
"Macs."
-msgstr "Загрузка программы установки с дискет не поддерживается на Amiga или 68k Mac."
+msgstr ""
+"Загрузка программы установки с дискет не поддерживается на Amiga или 68k Mac."
#. Tag: para
#: install-methods.xml:290
@@ -762,14 +766,17 @@ msgstr ""
#. Tag: para
#: install-methods.xml:537
#, no-c-format
-msgid "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
+msgid ""
+"Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
msgstr "Вставьте дискету, нажмите &enterkey; (начало с сектора 0)."
#. Tag: para
#: install-methods.xml:543
#, no-c-format
-msgid "Select the <filename>root.bin</filename> file in the file-opening dialog."
-msgstr "Выберите файл <filename>root.bin</filename> в появившемся диалоговом окне."
+msgid ""
+"Select the <filename>root.bin</filename> file in the file-opening dialog."
+msgstr ""
+"Выберите файл <filename>root.bin</filename> в появившемся диалоговом окне."
#. Tag: para
#: install-methods.xml:548
@@ -2070,18 +2077,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:1311
#, no-c-format
-#| msgid ""
-#| "Look in <filename>/etc/inetd.conf</filename> and remember the directory "
-#| "which is used as the argument of <command>in.tftpd</command><footnote> "
-#| "<para> The <userinput>-l</userinput> argument enables some versions of "
-#| "<command>in.tftpd</command> to log all requests to the system logs; this "
-#| "is useful for diagnosing boot errors. </para> </footnote>; you'll need "
-#| "that below. If you've had to change <filename>/etc/inetd.conf</filename>, "
-#| "you'll have to notify the running <command>inetd</command> process that "
-#| "the file has changed. On a Debian machine, run <userinput>/etc/init.d/"
-#| "inetd reload</userinput>; on other machines, find out the process ID for "
-#| "<command>inetd</command>, and run <userinput>kill -HUP <replaceable>inetd-"
-#| "pid</replaceable></userinput>."
msgid ""
"Look in <filename>/etc/inetd.conf</filename> and remember the directory "
"which is used as the argument of <command>in.tftpd</command><footnote> "
@@ -2099,20 +2094,17 @@ msgid ""
msgstr ""
"Загляните в файл <filename>/etc/inetd.conf</filename>и запомните каталог, "
"который используется в качестве аргумента <command>in.tftpd</"
-"command><footnote> <para> Все доступные в Debian альтернативы "
-"<command>in.tftpd</command> по умолчанию протоколируют TFTP "
-"запросы в системные журналы. Некоторые из них имеют параметр "
-"<userinput>-v</userinput>, который увеличивает подробность протокола. "
-"В случае проблем с загрузкой рекомендуется проверять сообщения "
-"журналов, чтобы понять причину ошибки. </para> </footnote> &mdash; "
-"он вам понадобиться позже. "
-"Если вы изменили <filename>/etc/inetd.conf</filename>, вам нужно "
-"уведомить об этом запущенный процесс <command>inetd</command>. "
-"На машине Debian "
-"выполните <userinput>/etc/init.d/inetd reload</userinput>; на других ОС "
-"определите ID процесса <command>inetd</command> и "
-"запустите "
-"<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>."
+"command><footnote> <para> Все доступные в Debian альтернативы <command>in."
+"tftpd</command> по умолчанию протоколируют TFTP запросы в системные журналы. "
+"Некоторые из них имеют параметр <userinput>-v</userinput>, который "
+"увеличивает подробность протокола. В случае проблем с загрузкой "
+"рекомендуется проверять сообщения журналов, чтобы понять причину ошибки. </"
+"para> </footnote> &mdash; он вам понадобиться позже. Если вы изменили "
+"<filename>/etc/inetd.conf</filename>, вам нужно уведомить об этом запущенный "
+"процесс <command>inetd</command>. На машине Debian выполните <userinput>/etc/"
+"init.d/inetd reload</userinput>; на других ОС определите ID процесса "
+"<command>inetd</command> и запустите <userinput>kill -HUP <replaceable>inetd-"
+"pid</replaceable></userinput>."
#. Tag: para
#: install-methods.xml:1331
@@ -2169,13 +2161,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:1363
#, no-c-format
-#| msgid ""
-#| "On NewWorld Power Macintosh machines, you will need to set up the "
-#| "<command>yaboot</command> boot loader as the TFTP boot image. "
-#| "<command>Yaboot</command> will then retrieve the kernel and RAMdisk "
-#| "images via TFTP itself. For net booting, use the <filename>yaboot-netboot."
-#| "conf</filename>. Just rename this to <filename>yaboot.conf</filename> in "
-#| "the TFTP directory."
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
"<command>yaboot</command> boot loader as the TFTP boot image. "
@@ -2183,11 +2168,10 @@ msgid ""
"via TFTP itself. You will need to download the following files from the "
"<filename>netboot/</filename> directory:"
msgstr ""
-"На машинах NewWorld Power Macintosh вам нужно настроить системный "
-"загрузчик <command>yaboot</command> на загрузку образа TFTP. "
-"<command>Yaboot</command> затем получит образы ядра и RAMdisk через TFTP "
-"сам. Вам нужно скачать следующие файлы из каталога "
-"<filename>netboot/</filename>:"
+"На машинах NewWorld Power Macintosh вам нужно настроить системный загрузчик "
+"<command>yaboot</command> на загрузку образа TFTP. <command>Yaboot</command> "
+"затем получит образы ядра и RAMdisk через TFTP сам. Вам нужно скачать "
+"следующие файлы из каталога <filename>netboot/</filename>:"
#. Tag: filename
#: install-methods.xml:1394
@@ -2438,4 +2422,3 @@ msgid ""
msgstr ""
"Полную документацию по автоматической установке и рабочий пример, который вы "
"можете отредактировать, находится в <xref linkend=\"appendix-preseed\"/>."
-
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 20d295784..c9bc03fa0 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -14,7 +14,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
#: preparing.xml:5
@@ -403,7 +404,8 @@ msgstr "Руководство по установке"
#: preparing.xml:251
#, no-c-format
msgid "This document you are now reading, in plain ASCII, HTML or PDF format."
-msgstr "Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF."
+msgstr ""
+"Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF."
#. Tag: itemizedlist
#: preparing.xml:257
@@ -445,7 +447,8 @@ msgstr "Техническая документация"
#. Tag: para
#: preparing.xml:285
#, no-c-format
-msgid "Often contains useful information on configuring or using your hardware."
+msgid ""
+"Often contains useful information on configuring or using your hardware."
msgstr ""
"Часто содержит полезную информацию по настройке и использованию вашего "
"аппаратного обеспечения."
@@ -564,7 +567,8 @@ msgstr "Информацию по аппаратному обеспечению
#: preparing.xml:398
#, no-c-format
msgid "The manuals that come with each piece of hardware."
-msgstr "В руководствах, которые были вместе с приобретённым аппаратным обеспечением."
+msgstr ""
+"В руководствах, которые были вместе с приобретённым аппаратным обеспечением."
#. Tag: para
#: preparing.xml:403
@@ -978,7 +982,8 @@ msgstr ""
msgid ""
"The system on your network that you should use as a DNS (Domain Name "
"Service) server."
-msgstr "Система в сети, которая используется как DNS (Domain Name Service) сервер."
+msgstr ""
+"Система в сети, которая используется как DNS (Domain Name Service) сервер."
#. Tag: para
#: preparing.xml:631
@@ -1044,7 +1049,8 @@ msgstr ""
#. Tag: para
#: preparing.xml:678
#, no-c-format
-msgid "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
+msgid ""
+"A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
msgstr ""
"Минимальной рекомендуемой конфигурацией для настольной системыявляется "
"машина с процессором Pentium 4, 1 ГГц."
@@ -1520,7 +1526,8 @@ msgstr ""
#: preparing.xml:955
#, no-c-format
msgid "Boot the Debian installer to continue installing Debian."
-msgstr "Загрузить программу установки Debian, чтобы продолжить установку Debian."
+msgstr ""
+"Загрузить программу установки Debian, чтобы продолжить установку Debian."
#. Tag: title
#: preparing.xml:969
@@ -2255,7 +2262,8 @@ msgstr ""
#: preparing.xml:1395
#, no-c-format
msgid "Pre-Installation Hardware and Operating System Setup"
-msgstr "Настройка аппаратного обеспечения и операционной системы перед установкой"
+msgstr ""
+"Настройка аппаратного обеспечения и операционной системы перед установкой"
#. Tag: para
#: preparing.xml:1396
@@ -2555,7 +2563,8 @@ msgstr "Изменение порядка загрузки на компьюте
#. Tag: para
#: preparing.xml:1603
#, no-c-format
-msgid "As your computer starts, press the keys to enter the SCSI setup utility."
+msgid ""
+"As your computer starts, press the keys to enter the SCSI setup utility."
msgstr ""
"Как только компьютер начнёт загружаться, нажмите клавиши для входа в меню "
"настройки SCSI."
@@ -2591,7 +2600,8 @@ msgstr "Найдите пункт изменения порядка загруз
#. Tag: para
#: preparing.xml:1627
#, no-c-format
-msgid "Set the utility so that the SCSI ID of the CD drive is first on the list."
+msgid ""
+"Set the utility so that the SCSI ID of the CD drive is first on the list."
msgstr "Настройте так, что SCSI ID привода компакт дисков был первым в списке."
#. Tag: para
@@ -2825,13 +2835,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:1787
#, no-c-format
-#| msgid ""
-#| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
-#| "<keycombo><keycap>Command</keycap> <keycap>option</keycap> <keycap>O</"
-#| "keycap> <keycap>F</keycap></keycombo> while booting. Generally it will "
-#| "check for these keystrokes after the chime, but the exact timing varies "
-#| "from model to model. See <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> "
-#| "for more hints."
msgid ""
"On &arch-title; Macintoshes, you invoke OpenFirmware with "
"<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </"
@@ -2841,10 +2844,10 @@ msgid ""
"\"></ulink> for more hints."
msgstr ""
"На &arch-title; Macintosh, OpenFirmware вызывается по нажатиям клавиш "
-"<keycombo><keycap>Command (клеверный лист/Apple)</keycap> <keycap>Option</keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> "
-"во время загрузки. Обычно, надо нажимать после звукового сигнала, "
-"но точный момент зависит от модели. Подробней "
-"смотрите <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
+"<keycombo><keycap>Command (клеверный лист/Apple)</keycap> <keycap>Option</"
+"keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> во время загрузки. "
+"Обычно, надо нажимать после звукового сигнала, но точный момент зависит от "
+"модели. Подробней смотрите <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
#. Tag: para
#: preparing.xml:1796
@@ -3298,4 +3301,3 @@ msgstr ""
"программы установки вместо отображения пользовательского интерфейса, "
"попробуйте изменить настройки экрана в MacOS на использование 256 цветов "
"вместо <quote>тысяч</quote> или <quote>миллионов</quote>."
-
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 3b077fa9f..762aaf1c0 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed.po\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-10 09:46+0400\n"
"Last-Translator: D-R L10N Team <debian-l10n-russian@lists.debian.org>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2273,7 +2273,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2282,6 +2298,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 2318c9d13..7a2b9e8a1 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-19 18:32+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2306,7 +2306,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2315,6 +2331,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 0b191e250..d60461de7 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: preseed\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-12 17:29+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2285,7 +2285,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2294,6 +2310,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index ced261e2c..fdb1f20a4 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-09 00:10+0000\n"
+"POT-Creation-Date: 2008-07-06 00:09+0000\n"
"PO-Revision-Date: 2008-05-19 19:22+0800\n"
"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -2110,7 +2110,23 @@ msgstr ""
#. Tag: screen
#: preseed.xml:980
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "#tasksel tasksel/first multiselect standard, web-server\n"
+#| "# If the desktop task is selected, install the kde and xfce desktops\n"
+#| "# instead of the default gnome desktop.\n"
+#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
+#| "\n"
+#| "# Individual additional packages to install\n"
+#| "#d-i pkgsel/include string openssh-server build-essential\n"
+#| "\n"
+#| "# Some versions of the installer can report back on what software you "
+#| "have\n"
+#| "# installed, and what software you use. The default is not to report "
+#| "back,\n"
+#| "# but sending reports helps the project determine what software is most\n"
+#| "# popular and include it on CDs.\n"
+#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
"# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2119,6 +2135,9 @@ msgid ""
"\n"
"# Individual additional packages to install\n"
"#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\n"
"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"