summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/el/boot-new.po101
-rw-r--r--po/el/random-bits.po45
-rw-r--r--po/ko/boot-new.po114
-rw-r--r--po/ko/random-bits.po95
-rw-r--r--po/pot/boot-new.pot82
-rw-r--r--po/pot/random-bits.pot6
-rw-r--r--po/pt/boot-new.po114
-rw-r--r--po/pt/random-bits.po46
-rw-r--r--po/ru/boot-new.po114
-rw-r--r--po/ru/random-bits.po105
-rw-r--r--po/sv/boot-new.po114
-rw-r--r--po/sv/random-bits.po43
-rw-r--r--po/vi/boot-new.po114
-rw-r--r--po/vi/random-bits.po56
-rw-r--r--po/zh_CN/boot-new.po114
-rw-r--r--po/zh_CN/random-bits.po95
-rw-r--r--po/zh_TW/boot-new.po101
-rw-r--r--po/zh_TW/random-bits.po40
18 files changed, 972 insertions, 527 deletions
diff --git a/po/el/boot-new.po b/po/el/boot-new.po
index cfb7f443b..9091d1bb6 100644
--- a/po/el/boot-new.po
+++ b/po/el/boot-new.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-01-04 22:01+0200\n"
"Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -379,17 +379,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
+msgid "dm-crypt"
msgstr ""
#. Tag: para
#: boot-new.xml:205
#, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -399,48 +399,79 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:227
+#, no-c-format
+msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
msgstr ""
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:236 boot-new.xml:261
#, no-c-format
msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
+msgid "loop-AES"
msgstr ""
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr ""
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -449,7 +480,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -458,7 +489,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -475,7 +506,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -491,7 +522,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -499,10 +530,10 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:303
+#: boot-new.xml:327
#, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -516,13 +547,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "Είσοδος στο Σύστημα"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -535,7 +566,7 @@ msgstr ""
"εγκατάστασης. Το σύστημά σας είναι τώρα έτοιμο για να το χρησιμοποιήσετε."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -550,7 +581,7 @@ msgstr ""
"Εδώ είναι μερικά σημεία αφετηρίας."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -567,7 +598,7 @@ msgstr ""
"share/doc/apt/guide.html/index.html</filename>."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -585,7 +616,7 @@ msgstr ""
"HTML/index.html</filename>."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -598,7 +629,7 @@ msgstr ""
"παριστάνει τον τρέχοντα κατάλογο)."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -626,7 +657,7 @@ msgstr ""
"γράμμα αυτό και στη συνέχεια δυο φορές το tab."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index 015014b1b..e2a0fb956 100644
--- a/po/el/random-bits.po
+++ b/po/el/random-bits.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-02-09 00:33+0200\n"
"Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -35,21 +35,14 @@ msgstr "Συσκευές Linux"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"Στο Linux έχετε διάφορα ειδικά αρχεία στο <filename>/dev</filename>. Αυτά τα "
-"αρχεία ονομάζονται αρχεία συσκευών. Στον κόσμο του Unix η πρόσβαση στο υλικό "
-"είναι διαφορετική. Εκεί έχουμε ένα ειδικό αρχείο που πραγματικά τρέχει έναν "
-"οδηγό που με τη σειρά του προσπελάζει το υλικό. Το αρχείο της συσκευής είναι "
-"ένα διάμεσος στην πραγματική συνιστώσα του συστήματος. Αρχεία κάτω από το "
-"<filename>/dev</filename> συμπεριφέρονται επίσης διαφορετικά από τα "
-"συνηθισμένα αρχεία. Παρακάτω αναφέρονται τα πιο σημαντικά αρχεία συσκευών."
#. Tag: filename
#: random-bits.xml:27
@@ -311,8 +304,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "Οτιδήποτε κατευθύνεται σε αυτή τη συσκευή θα εξαφανιστεί"
#. Tag: filename
@@ -1713,6 +1706,24 @@ msgstr ""
"<filename>/etc/resolv.conf</filename>)."
#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "Στο Linux έχετε διάφορα ειδικά αρχεία στο <filename>/dev</filename>. Αυτά "
+#~ "τα αρχεία ονομάζονται αρχεία συσκευών. Στον κόσμο του Unix η πρόσβαση στο "
+#~ "υλικό είναι διαφορετική. Εκεί έχουμε ένα ειδικό αρχείο που πραγματικά "
+#~ "τρέχει έναν οδηγό που με τη σειρά του προσπελάζει το υλικό. Το αρχείο της "
+#~ "συσκευής είναι ένα διάμεσος στην πραγματική συνιστώσα του συστήματος. "
+#~ "Αρχεία κάτω από το <filename>/dev</filename> συμπεριφέρονται επίσης "
+#~ "διαφορετικά από τα συνηθισμένα αρχεία. Παρακάτω αναφέρονται τα πιο "
+#~ "σημαντικά αρχεία συσκευών."
+
+#~ msgid ""
#~ "Boot the installation media. The installation needs to be run in expert "
#~ "mode; enter <userinput>expert</userinput> at the boot prompt. Below are "
#~ "the answers that should be given during various stages of the "
diff --git a/po/ko/boot-new.po b/po/ko/boot-new.po
index e0a6fc577..2172ee761 100644
--- a/po/ko/boot-new.po
+++ b/po/ko/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new.xml\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-24 23:57+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -353,17 +353,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -373,9 +373,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"loop-AES로 암호화한 파티션의 경우 부팅할 때 다음과 같이 물어봅니다: "
"<informalexample><screen>\n"
@@ -393,14 +393,33 @@ msgstr ""
"볼 수도 있습니다."
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
#, no-c-format
msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"열쇠글을 입력할 때는 아무런 글자도 (별표 조차도) 나타나지 않습니다. 오직 "
"<emphasis>단 한번</emphasis>만 입력할 수 있으니 주의하십시오. 열쇠글이 틀리"
@@ -409,31 +428,43 @@ msgstr ""
"부분을 보십시오."
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr "모든 열쇠글을 입력하면 부팅은 평소와 같이 계속 진행합니다."
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "TODO: write something once it works."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "문제 해결"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -444,7 +475,7 @@ msgstr ""
"운트해야 합니다. 여러가지 경우가 있습니다."
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -455,7 +486,7 @@ msgstr ""
"추게 되고 컴퓨터를 다시 시작해서 열쇠글을 다시 입력해야 합니다."
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -481,7 +512,7 @@ msgstr ""
"마운트와 다른점은 이 볼륨의 열쇠글을 입력해야 한다는 것 뿐입니다."
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -506,7 +537,7 @@ msgstr ""
"을 마치면 해당 볼륨을 평소와 다름없이 마운트할 수 있습니다:"
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -516,10 +547,10 @@ msgstr ""
"userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -543,13 +574,13 @@ msgstr ""
"다."
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "로그인"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -561,7 +592,7 @@ msgstr ""
"할 준비가 되었습니다."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -574,7 +605,7 @@ msgstr ""
"합하는 작업이 진행 중입니다. 이 문서 역시 몇 개의 시작 지점입니다."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -590,7 +621,7 @@ msgstr ""
"에 위치해 있습니다."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -606,7 +637,7 @@ msgstr ""
"html</filename> 안에 브라우징 할 수 있는 색인된 문서를 볼 수 있을 것입니다."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -618,7 +649,7 @@ msgstr ""
"렉토리를 의미합니다.)을 입력하세요."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -641,7 +672,7 @@ msgstr ""
"모든 명령들의 목록을 보기 원한다면 특정 문자를 입력하고 탭을 두번 누릅니다."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -649,3 +680,6 @@ msgid ""
msgstr ""
"데비안 GNU/리눅스에 대한 완전한 소개를 원한다면 <filename>/usr/share/doc/"
"debian-guide/html/noframes/index.html</filename>를 보세요."
+
+#~ msgid "TODO: write something once it works."
+#~ msgstr "TODO: write something once it works."
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index 90d1c18c5..2b03d95d6 100644
--- a/po/ko/random-bits.po
+++ b/po/ko/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits.xml\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-08-05 14:54+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -30,20 +30,14 @@ msgstr "리눅스 장치"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"리눅스에서는 <filename>/dev</filename> 안에 여러가지 특수한 파일이 들어 있습"
-"니다. 이 파일들을 장치 파일이라고 합니다. 유닉스 세계에서는 하드웨어를 접근하"
-"는 방법이 좀 다릅니다. 어떤 특수 파일에 접근하면 실제로는 거기에 해당하는 하"
-"드웨어에 접근하게 됩니다. 장치 파일은 실제 시스템의 구성 하드웨어에 대한 인터"
-"페이스입니다. <filename>/dev</filename>에 있는 파일은 일반 파일과 완전히 다르"
-"게 동작하기도 합니다. 다음은 중요한 장치 파일의 목록입니다."
#. Tag: filename
#: random-bits.xml:27
@@ -305,8 +299,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "이 장치로 들어간 데이터는 모두 사라집니다"
#. Tag: filename
@@ -673,7 +667,9 @@ msgstr "<entry>87</entry>"
msgid ""
"The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE "
"desktop environments."
-msgstr "<emphasis>Desktop</emphasis> 작업은 그놈과 KDE 데스크탑 환경을 모두 설치합니다."
+msgstr ""
+"<emphasis>Desktop</emphasis> 작업은 그놈과 KDE 데스크탑 환경을 모두 설치합니"
+"다."
#. Tag: para
#: random-bits.xml:281
@@ -762,9 +758,12 @@ msgid ""
"</screen></informalexample> To create an ext2 file system instead, omit "
"<userinput>-j</userinput>."
msgstr ""
-"다음과 같이 파티션에 파일 시스템을 만드십시오. 예를 들어 <filename>/dev/hda6</filename> 파티션에 ext3 파일 시스템을 만드는 경우라면 (여기 예제에서 루트 파티션입니다): <informalexample><screen>\n"
+"다음과 같이 파티션에 파일 시스템을 만드십시오. 예를 들어 <filename>/dev/"
+"hda6</filename> 파티션에 ext3 파일 시스템을 만드는 경우라면 (여기 예제에서 루"
+"트 파티션입니다): <informalexample><screen>\n"
"# mke2fs -j /dev/hda6\n"
-"</screen></informalexample> ext2 파일 시스템을 만드는 경우라면 <userinput>-j</userinput> 옵션을 빼십시오."
+"</screen></informalexample> ext2 파일 시스템을 만드는 경우라면 <userinput>-"
+"j</userinput> 옵션을 빼십시오."
#. Tag: para
#: random-bits.xml:340
@@ -829,7 +828,16 @@ msgid ""
"command>. </para> </footnote>. Install <command>wget</command> and "
"<command>ar</command> if they aren't already on your current system, then "
"download and install <command>debootstrap</command>."
-msgstr "데비안 설치 프로그램이 사용하는 프로그램으로, 데비안 베이스 시스템을 설치하는 공식적인 방법은 <command>debootstrap</command>입니다. <command>debootstrap</command>은 <command>wget</command>과 <command>ar</command>을 사용하지만, 그 밖에는 <classname>/bin/sh</classname>와 기본 Unix/Linux도구들 <footnote><para> 여기엔 GNU 기본 유틸리티와 <command>sed</command>, <command>grep</command>, <command>tar</command>와<command>gzip</command>같은 명령을 포함합니다. </para> </footnote>만 있으면 됩니다. 기존 시스템에 <command>wget</command>과 <command>ar</command>이 없으면 설치하십시오. 그리고 <command>debootstrap</command>을 내려 받고 설치하십시오."
+msgstr ""
+"데비안 설치 프로그램이 사용하는 프로그램으로, 데비안 베이스 시스템을 설치하"
+"는 공식적인 방법은 <command>debootstrap</command>입니다. "
+"<command>debootstrap</command>은 <command>wget</command>과 <command>ar</"
+"command>을 사용하지만, 그 밖에는 <classname>/bin/sh</classname>와 기본 Unix/"
+"Linux도구들 <footnote><para> 여기엔 GNU 기본 유틸리티와 <command>sed</"
+"command>, <command>grep</command>, <command>tar</command>와<command>gzip</"
+"command>같은 명령을 포함합니다. </para> </footnote>만 있으면 됩니다. 기존 시"
+"스템에 <command>wget</command>과 <command>ar</command>이 없으면 설치하십시"
+"오. 그리고 <command>debootstrap</command>을 내려 받고 설치하십시오."
#. Tag: para
#: random-bits.xml:396
@@ -1217,10 +1225,15 @@ msgid ""
"other than ASCII or latin1, please consult the appropriate localization "
"HOWTO."
msgstr ""
-"영어가 아닌 언어를 사용할 때 로케일을 설정하려면 <classname>locales</classname> 지원 꾸러미를 설치하고 그 꾸러미를 설정하십시오: <informalexample><screen>\n"
+"영어가 아닌 언어를 사용할 때 로케일을 설정하려면 <classname>locales</"
+"classname> 지원 꾸러미를 설치하고 그 꾸러미를 설정하십시오: "
+"<informalexample><screen>\n"
"# aptitude install locales\n"
"# dpkg-reconfigure locales\n"
-"</screen></informalexample> 주의: 이 명령을 실행하기 전에 source.list를 생성하고 <command>apt-get update</command>를 실행해서 <classname>apt</classname>를 설정해야 합니다. ASCII 혹은 latin1 이외의 문자셋을 사용하는 로케일을 사용하려면 그 전에 적당한 지역화 HOWTO를 참고하십시오."
+"</screen></informalexample> 주의: 이 명령을 실행하기 전에 source.list를 생성"
+"하고 <command>apt-get update</command>를 실행해서 <classname>apt</classname>"
+"를 설정해야 합니다. ASCII 혹은 latin1 이외의 문자셋을 사용하는 로케일을 사용"
+"하려면 그 전에 적당한 지역화 HOWTO를 참고하십시오."
#. Tag: title
#: random-bits.xml:582
@@ -1253,7 +1266,10 @@ msgid ""
"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
"arch-etc</replaceable>"
-msgstr "# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
+"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
+"arch-etc</replaceable>"
#. Tag: title
#: random-bits.xml:598
@@ -1269,7 +1285,11 @@ msgid ""
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
-msgstr "&debian; 시스템을 부팅 가능하게 하려면, 부트로더를 설정해서 루트 파티션에서 설치한 커널을 읽어들이도록 하십시오. <command>debootstrap</command>은 부트로더를 설치하지 않는다는 점에 주의하십시오. 하지만 <command>aptitude</command>을 데비안 chroot 안에서 사용하면 부트로더를 설치할 수 있습니다."
+msgstr ""
+"&debian; 시스템을 부팅 가능하게 하려면, 부트로더를 설정해서 루트 파티션에서 "
+"설치한 커널을 읽어들이도록 하십시오. <command>debootstrap</command>은 부트로"
+"더를 설치하지 않는다는 점에 주의하십시오. 하지만 <command>aptitude</command>"
+"을 데비안 chroot 안에서 사용하면 부트로더를 설치할 수 있습니다."
#. Tag: para
#: random-bits.xml:606
@@ -1548,8 +1568,14 @@ msgid ""
"</screen></informalexample> Below are the answers that should be given "
"during various stages of the installation."
msgstr ""
-"설치 미디어를 부팅하십시오. 설치는 전문가 모드에서 실행해야 합니다. 부팅 프롬프트에서 <userinput>expert</userinput>를 입력하십시오. 커널 모듈의 파라미터를 설정하려면, 부팅 파라미터에도 설정해야 합니다. 예를 들어, 설치 프로그램을 부팅하고 partport_pc 모듈의 <quote>io</quote> 및 <quote>irq</quote> 파라미터의 값을 설정하려면, 다음을 부팅 파라미터에 입력하십시오: <informalexample><screen>\n"
-"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc.irq=<replaceable>7</replaceable>\n"
+"설치 미디어를 부팅하십시오. 설치는 전문가 모드에서 실행해야 합니다. 부팅 프롬"
+"프트에서 <userinput>expert</userinput>를 입력하십시오. 커널 모듈의 파라미터"
+"를 설정하려면, 부팅 파라미터에도 설정해야 합니다. 예를 들어, 설치 프로그램을 "
+"부팅하고 partport_pc 모듈의 <quote>io</quote> 및 <quote>irq</quote> 파라미터"
+"의 값을 설정하려면, 다음을 부팅 파라미터에 입력하십시오: "
+"<informalexample><screen>\n"
+"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
+"irq=<replaceable>7</replaceable>\n"
"</screen></informalexample> 아래는 설치 단계에서 입력해야 할 사항들입니다."
#. Tag: guimenuitem
@@ -1637,3 +1663,20 @@ msgid ""
msgstr ""
"네임서버 주소: 소스에서 사용한 같은 주소를 입력합니다. (<filename>/etc/"
"resolv.conf</filename> 파일 참고)"
+
+#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "리눅스에서는 <filename>/dev</filename> 안에 여러가지 특수한 파일이 들어 있"
+#~ "습니다. 이 파일들을 장치 파일이라고 합니다. 유닉스 세계에서는 하드웨어를 "
+#~ "접근하는 방법이 좀 다릅니다. 어떤 특수 파일에 접근하면 실제로는 거기에 해"
+#~ "당하는 하드웨어에 접근하게 됩니다. 장치 파일은 실제 시스템의 구성 하드웨어"
+#~ "에 대한 인터페이스입니다. <filename>/dev</filename>에 있는 파일은 일반 파"
+#~ "일과 완전히 다르게 동작하기도 합니다. 다음은 중요한 장치 파일의 목록입니"
+#~ "다."
diff --git a/po/pot/boot-new.pot b/po/pot/boot-new.pot
index b386fe046..32e35236c 100644
--- a/po/pot/boot-new.pot
+++ b/po/pot/boot-new.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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+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"
@@ -179,63 +179,87 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
+msgid "dm-crypt"
msgstr ""
#. Tag: para
#: boot-new.xml:205
#, no-c-format
msgid ""
- "For partitions encrypted via loop-AES you will be shown the following prompt during the boot: <informalexample><screen>\n"
- "mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
- "Password:\n"
- "</screen></informalexample> In the first line of the prompt, <replaceable>X</replaceable> is the number of the loop device. You are now probably wondering <emphasis>for which volume</emphasis> you are actually entering the passphrase. Does it relate to your <filename>/home</filename>? Or to <filename>/var</filename>? Of course, if you have just one encrypted volume, this is easy and you can just enter the passphrase you used when setting up this volume. If you set up more than one encrypted volume during the installation, the notes you wrote down as the last step in <xref linkend=\"partman-crypto\"/> come in handy. If you did not make a note of the mapping between <filename>loop<replaceable>X</replaceable></filename> and the mount points before, you can still find it in <filename>/etc/fstab</filename> of your new system."
+ "For partitions encrypted using dm-crypt you will be shown the following prompt during the boot: <informalexample><screen>\n"
+ "Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+ "Enter LUKS passphrase:\n"
+ "</screen></informalexample> In the first line of the prompt, <replaceable>X</replaceable> is the number of the loop device. You are now probably wondering <emphasis>for which volume</emphasis> you are actually entering the passphrase. Does it relate to your <filename>/home</filename>? Or to <filename>/var</filename>? Of course, if you have just one encrypted volume, this is easy and you can just enter the passphrase you used when setting up this volume. If you set up more than one encrypted volume during the installation, the notes you wrote down as the last step in <xref linkend=\"partman-crypto\"/> come in handy. If you did not make a note of the mapping between <filename>crypt<replaceable>X</replaceable></filename> and the mount points before, you can still find it in <filename>/etc/crypttab</filename> and <filename>/etc/fstab</filename> of your new system."
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:227
+#, no-c-format
+msgid "The prompt may look somewhat different when an encrypted root file system is mounted. This depends on which initramfs generator was used to generate the initrd used to boot the system. The example below is for an initrd generated using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+ "Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+ "Begin: Running /scripts/local-top ...\n"
+ "Enter LUKS passphrase:"
msgstr ""
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:236 boot-new.xml:261
#, no-c-format
-msgid "No characters (even asterisks) will be shown while entering the passphrase. Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong passphrase, an error message will appear and the boot process will skip that volume and continue to mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting\"/> for further information."
+msgid "No characters (even asterisks) will be shown while entering the passphrase. If you enter the wrong passphrase, you have two more tries to correct it. After the third try the boot process will skip this volume and continue to mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting\"/> for further information."
msgstr ""
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
+msgid "loop-AES"
msgstr ""
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
#, no-c-format
-msgid "TODO: write something once it works."
+msgid "For partitions encrypted using loop-AES you will be shown the following prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
+#, no-c-format
+msgid ""
+ "Checking loop-encrypted file systems.\n"
+ "Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</replaceable>)\n"
+ "Password:"
msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr ""
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid "If some of the encrypted volumes could not be mounted because a wrong passphrase was entered, you will have to mount them manually after the boot. There are several cases."
msgstr ""
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid "The first case concerns the root partition. When it is not mounted correctly, the boot process will halt and you will have to reboot the computer to try again."
msgstr ""
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</filename> or <filename>/srv</filename>. You can simply mount them manually after the boot. For loop-AES this is one-step operation: <informalexample><screen>\n"
@@ -245,7 +269,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes with <application>device mapper</application> by running: <informalexample><screen>\n"
@@ -254,64 +278,64 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></userinput>"
msgstr ""
#. Tag: para
-#: boot-new.xml:303
+#: boot-new.xml:327
#, no-c-format
msgid ""
- "If the volumes holding noncritical system files could not be mounted (<filename>/usr</filename> or <filename>/var</filename>), the system should still boot and you should be able to mount the volumes manually like in the previous case. However, you will also need to (re)start any services usually running in your default runlevel because it is very likely that they were not started. The easiest way to achieve this is by switching to the first runlevel and back by entering <informalexample><screen>\n"
+ "If any volume holding noncritical system files could not be mounted (<filename>/usr</filename> or <filename>/var</filename>), the system should still boot and you should be able to mount the volumes manually like in the previous case. However, you will also need to (re)start any services usually running in your default runlevel because it is very likely that they were not started. The easiest way to achieve this is by switching to the first runlevel and back by entering <informalexample><screen>\n"
"<prompt>#</prompt> <userinput>init 1</userinput>\n"
"</screen></informalexample> at the shell prompt and pressing <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo> when asked for the root password."
msgstr ""
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr ""
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid "Once your system boots, you'll be presented with the login prompt. Log in using the personal login and password you selected during the installation process. Your system is now ready to use."
msgstr ""
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid "If you are a new user, you may want to explore the documentation which is already installed on your system as you start to use it. There are currently several documentation systems, work is proceeding on integrating the different types of documentation. Here are a few starting points."
msgstr ""
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid "Documentation accompanying programs you have installed is in <filename>/usr/share/doc/</filename>, under a subdirectory named after the program. For example, the APT User's Guide for using <command>apt</command> to install other programs on your system, is located in <filename>/usr/share/doc/apt/guide.html/index.html</filename>."
msgstr ""
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid "In addition, there are some special folders within the <filename>/usr/share/doc/</filename> hierarchy. Linux HOWTOs are installed in <emphasis>.gz</emphasis> format, in <filename>/usr/share/doc/HOWTO/en-txt/</filename>. After installing <command>dhelp</command> you will find a browse-able index of documentation in <filename>/usr/share/doc/HTML/index.html</filename>."
msgstr ""
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid "One easy way to view these documents is to <userinput>cd /usr/share/doc/</userinput>, and type <userinput>lynx</userinput> followed by a space and a dot (the dot stands for the current directory)."
msgstr ""
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid "You can also type <userinput>info <replaceable>command</replaceable></userinput> or <userinput>man <replaceable>command</replaceable></userinput> to see documentation on most commands available at the command prompt. Typing <userinput>help</userinput> will display help on shell commands. And typing a command followed by <userinput>--help</userinput> will usually display a short summary of the command's usage. If a command's results scroll past the top of the screen, type <userinput>| more</userinput> after the command to cause the results to pause before scrolling past the top of the screen. To see a list of all commands available which begin with a certain letter, type the letter and then two tabs."
msgstr ""
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid "For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/share/doc/debian-guide/html/noframes/index.html</filename>."
msgstr ""
diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index d709b412f..506b24d31 100644
--- a/po/pot/random-bits.pot
+++ b/po/pot/random-bits.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: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+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"
@@ -29,7 +29,7 @@ msgstr ""
#. Tag: para
#: random-bits.xml:12
#, no-c-format
-msgid "In Linux you have various special files in <filename>/dev</filename>. These files are called device files. In the Unix world accessing hardware is different. There you have a special file which actually runs a driver which in turn accesses the hardware. The device file is an interface to the actual system component. Files under <filename>/dev</filename> also behave differently than ordinary files. Below are the most important device files listed."
+msgid "In Linux various special files can be found under the directory <filename>/dev</filename>. These files are called device files and behave unlike ordinary files. The most common types of device files are for block devices and character devices. These files are an interface to the actual driver (part of the Linux kernel) which in turn accesses the hardware. Another, less common, type of device file is the named <firstterm>pipe</firstterm>. The most important device files are listed in the tables below."
msgstr ""
#. Tag: filename
@@ -293,7 +293,7 @@ msgstr ""
#. Tag: entry
#: random-bits.xml:115
#, no-c-format
-msgid "Everything pointed to this device will disappear"
+msgid "Anything written to this device will disappear"
msgstr ""
#. Tag: filename
diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po
index 6ab31aae4..ad095a26b 100644
--- a/po/pt/boot-new.po
+++ b/po/pt/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-01-14 14:44+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese \n"
@@ -357,17 +357,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -377,9 +377,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"Para partições encriptadas via loop-AES, durante o arranque, ser-lhe-á "
"mostrada a seguinte pergunta: <informalexample><screen>\n"
@@ -399,14 +399,33 @@ msgstr ""
"ainda o pode encontrar em <filename>/etc/fstab</filename> do seu sistema."
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
+#, no-c-format
+msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
#, no-c-format
msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"Não serão mostrados nenhuns caracteres (nem asteriscos) enquanto introduz a "
"frase-chave. Tenha cuidado, tem apenas <emphasis>uma</emphasis> tentativa.Se "
@@ -416,7 +435,7 @@ msgstr ""
"\"crypto-troubleshooting\"/>."
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
@@ -424,25 +443,37 @@ msgstr ""
"normalmente."
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "PARA FAZER: escrever qualquer coisa assim que funcionar."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "Diagnóstico de problemas"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -454,7 +485,7 @@ msgstr ""
"manualmente.Existem vários casos."
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -466,7 +497,7 @@ msgstr ""
"computador para tentar novamente."
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -494,7 +525,7 @@ msgstr ""
"introduzir a frase-chave para este volume."
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -520,7 +551,7 @@ msgstr ""
"com sucesso pode simplesmente montar os volumes da forma usual:"
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -530,10 +561,10 @@ msgstr ""
"userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -559,13 +590,13 @@ msgstr ""
"pedida a password de root."
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "Log In"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -578,7 +609,7 @@ msgstr ""
"pronto a ser utilizado."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -593,7 +624,7 @@ msgstr ""
"pontos de partida."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -610,7 +641,7 @@ msgstr ""
"filename>."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -626,7 +657,7 @@ msgstr ""
"índices navegáveis da documentação instalada pelo <command>dhelp</command>."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -638,7 +669,7 @@ msgstr ""
"e um ponto (o ponto significa o directório actual)."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -665,7 +696,7 @@ msgstr ""
"a letra seguido de dois tabs."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -674,6 +705,9 @@ msgstr ""
"Para uma introdução mais completa ao Debian e ao GNU/Linux, consulte "
"<filename>/usr/share/doc/debian-guide/html/noframes/index.html</filename>."
+#~ msgid "TODO: write something once it works."
+#~ msgstr "PARA FAZER: escrever qualquer coisa assim que funcionar."
+
#~ msgid "Debian Post-Boot (Base) Configuration"
#~ msgstr "Configuração para depois da inicialização (Base) do Debian"
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index 5452e6e15..589c731cf 100644
--- a/po/pt/random-bits.po
+++ b/po/pt/random-bits.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-06-27 00:11+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -33,22 +33,14 @@ msgstr "Dispositivos em Linux"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"Em Linux você tem vários ficheiros especiais em <filename>/dev</filename>. "
-"Este ficheiros são chamados ficheiros de dispositivos. No mundo Unix aceder "
-"a hardware é diferente. Lá você tem um ficheiro especial que na realidade "
-"corre um controlador que por sua vez acede ao hardware. O ficheiro de "
-"dispositivo é um interface para o verdadeiro componente do sistema. Os "
-"ficheiros sob <filename>/dev</filename> também se comportam de forma "
-"diferente dos ficheiros vulgares. Abaixo estão listados os ficheiros de "
-"dispositivos mais importantes."
#. Tag: filename
#: random-bits.xml:27
@@ -310,8 +302,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "Tudo o que for enviado para este dispositivo irá desaparecer"
#. Tag: filename
@@ -1694,6 +1686,24 @@ msgstr ""
"utilizados na fonte (veja <filename>/etc/resolv.conf</filename>)"
#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "Em Linux você tem vários ficheiros especiais em <filename>/dev</"
+#~ "filename>. Este ficheiros são chamados ficheiros de dispositivos. No "
+#~ "mundo Unix aceder a hardware é diferente. Lá você tem um ficheiro "
+#~ "especial que na realidade corre um controlador que por sua vez acede ao "
+#~ "hardware. O ficheiro de dispositivo é um interface para o verdadeiro "
+#~ "componente do sistema. Os ficheiros sob <filename>/dev</filename> também "
+#~ "se comportam de forma diferente dos ficheiros vulgares. Abaixo estão "
+#~ "listados os ficheiros de dispositivos mais importantes."
+
+#~ msgid ""
#~ "Boot the installation media. The installation needs to be run in expert "
#~ "mode; enter <userinput>expert</userinput> at the boot prompt. Below are "
#~ "the answers that should be given during various stages of the "
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index ab9b5bacb..f14985ecf 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-12 22:49+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -360,17 +360,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -380,9 +380,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"Для разделов, зашифрованных loop-AES, во время загрузки вы увидите следующее "
"сообщение: <informalexample><screen>\n"
@@ -401,14 +401,33 @@ msgstr ""
"etc/fstab</filename>."
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
#, no-c-format
msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"Во время ввода ключевой фразы символы не отображаются (даже звёздочками). "
"Осторожно, у вас есть только <emphasis>одна попытка</emphasis>. Если вы "
@@ -417,31 +436,43 @@ msgstr ""
"системы. Подробней смотрите в <xref linkend=\"crypto-troubleshooting\"/>."
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr "После ввода всех ключевых фраз загрузка продолжится как обычно."
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "TODO: написать как это работает."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "Устранение неполадок"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -453,7 +484,7 @@ msgstr ""
"Но есть несколько случаев."
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -465,7 +496,7 @@ msgstr ""
"попробовать ещё раз."
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -493,7 +524,7 @@ msgstr ""
"ключевой фразы для этого тома."
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -519,7 +550,7 @@ msgstr ""
"смонтировать тома как обычно:"
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -529,10 +560,10 @@ msgstr ""
"replaceable></userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -558,13 +589,13 @@ msgstr ""
"суперпользователя."
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "Вход в систему"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -576,7 +607,7 @@ msgstr ""
"процесса установки. Система готова к работе."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -589,7 +620,7 @@ msgstr ""
"работа над их объединением. Вот несколько мест, откуда можно начать."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -605,7 +636,7 @@ msgstr ""
"html/index.html</filename>."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -621,7 +652,7 @@ msgstr ""
"html</filename> со ссылками на документацию."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -633,7 +664,7 @@ msgstr ""
"(точка означает текущий каталог)."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -660,7 +691,7 @@ msgstr ""
"нажмите клавишу табуляции два раза."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -668,3 +699,6 @@ msgid ""
msgstr ""
"Более полное введение в Debian и GNU/Linux, смотрите в <filename>/usr/share/"
"doc/debian-guide/html/noframes/index.html</filename>."
+
+#~ msgid "TODO: write something once it works."
+#~ msgstr "TODO: написать как это работает."
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index b1e38d283..f87666bad 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-08-03 21:54+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -32,22 +32,14 @@ msgstr "Устройства Linux"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"В Linux в каталоге <filename>/dev</filename> содержатся различные "
-"специальные файлы. Эти файлы называются файлами устройств. Доступ к "
-"устройствам в мире Unix отличается от того, как это сделано в других "
-"операционных системах. Здесь это делается через специальный файл, который в "
-"действительности обслуживается драйвером, осуществляющим доступ к "
-"устройству. Файл устройства &mdash; это интерфейс к реальным системным "
-"компонентам. Файлы в <filename>/dev</filename> также и ведут себя по-"
-"другому. Ниже перечислены самые важные файлы устройств."
#. Tag: filename
#: random-bits.xml:27
@@ -309,8 +301,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "Всё, что направлено в этот интерфейс, исчезнет"
#. Tag: filename
@@ -390,11 +382,11 @@ msgid ""
"current/doc/html/mouse.html\">README.mouse</ulink>."
msgstr ""
"Если gpm выключен или не установлен по какой-то причине, убедитесь что X "
-"сервер настроен на чтение непосредственно с устройства мыши, например из "
-"/dev/psaux. Подробней смотрите 3-Button Mouse mini-Howto в "
-"<filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>, <userinput>man gpm</userinput>, "
-"<filename>/usr/share/doc/gpm/FAQ.gz</filename> и "
-"<ulink url=\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>."
+"сервер настроен на чтение непосредственно с устройства мыши, например из /"
+"dev/psaux. Подробней смотрите 3-Button Mouse mini-Howto в <filename>/usr/"
+"share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>, <userinput>man "
+"gpm</userinput>, <filename>/usr/share/doc/gpm/FAQ.gz</filename> и <ulink url="
+"\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>."
#. Tag: para
#: random-bits.xml:158
@@ -851,9 +843,8 @@ msgid ""
msgstr ""
"Утилита, которой пользуется программа установки Debian и которая признана "
"официальным способом установки базовой системы Debian является "
-"<command>debootstrap</command>. Она использует "
-"<command>wget</command> и <command>ar</command>, "
-"но зависит только от <classname>/bin/sh</classname> и "
+"<command>debootstrap</command>. Она использует <command>wget</command> и "
+"<command>ar</command>, но зависит только от <classname>/bin/sh</classname> и "
"часто используемых инструментов Unix/Linux<footnote> <para> Сюда входят "
"базовые утилиты GNU и команды типа <command>sed</command>, <command>grep</"
"command>, <command>tar</command> и <command>gzip</command>. </para> </"
@@ -1251,15 +1242,15 @@ msgid ""
"HOWTO."
msgstr ""
"Чтобы использовать язык, отличный от английского, нужно настроить локаль. "
-"Для этого установите пакет поддержки <classname>locales</classname> и настройте его: "
-"<informalexample><screen>\n"
+"Для этого установите пакет поддержки <classname>locales</classname> и "
+"настройте его: <informalexample><screen>\n"
"# aptitude install locales\n"
"# dpkg-reconfigure locales\n"
-"</screen></informalexample> ЗАМЕЧАНИЕ: <classname>apt</classname> "
-"должна быть настроен заранее; для этого создайте файл sources.list и запустите "
-"команду <command>aptitude update</command>. Перед "
-"использованием локалей с набором символов, отличным от ASCII или latin1, "
-"пожалуйста проконсультируйтесь с соответствующим HOWTO по локализации."
+"</screen></informalexample> ЗАМЕЧАНИЕ: <classname>apt</classname> должна "
+"быть настроен заранее; для этого создайте файл sources.list и запустите "
+"команду <command>aptitude update</command>. Перед использованием локалей с "
+"набором символов, отличным от ASCII или latin1, пожалуйста "
+"проконсультируйтесь с соответствующим HOWTO по локализации."
#. Tag: title
#: random-bits.xml:582
@@ -1312,12 +1303,11 @@ msgid ""
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"Чтобы сделать систему &debian; загружаемой, настройте системный "
-"загрузчик на загрузку установленного ядра с новым корневым разделом. "
-"Заметим, что <command>debootstrap</command> не устанавливает "
-"системный загрузчик, хотя вы "
-"можете использовать <command>aptitude</command> внутри вашего "
-"Debian chroot, чтобы сделать это."
+"Чтобы сделать систему &debian; загружаемой, настройте системный загрузчик на "
+"загрузку установленного ядра с новым корневым разделом. Заметим, что "
+"<command>debootstrap</command> не устанавливает системный загрузчик, хотя вы "
+"можете использовать <command>aptitude</command> внутри вашего Debian chroot, "
+"чтобы сделать это."
#. Tag: para
#: random-bits.xml:606
@@ -1604,12 +1594,11 @@ msgid ""
"during various stages of the installation."
msgstr ""
"Загрузитесь с установочного носителя. Установка должна быть запущена в "
-"экспертном режиме; в приглашении к загрузке введите "
-"<userinput>expert</userinput>. Если требуется задать "
-"параметры для модулей ядра, вы также должны указать их в приглашении к "
-"загрузке. Например, для загрузки программы установки и настройки значений параметров "
-"<quote>io</quote> и <quote>irq</quote> для модуля parport_pc, "
-"введите следующее: <informalexample><screen>\n"
+"экспертном режиме; в приглашении к загрузке введите <userinput>expert</"
+"userinput>. Если требуется задать параметры для модулей ядра, вы также "
+"должны указать их в приглашении к загрузке. Например, для загрузки программы "
+"установки и настройки значений параметров <quote>io</quote> и <quote>irq</"
+"quote> для модуля parport_pc, введите следующее: <informalexample><screen>\n"
"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
"irq=<replaceable>7</replaceable>\n"
"</screen></informalexample> Ниже показаны ответы, которые нужно ввести на "
@@ -1679,8 +1668,10 @@ msgstr "Настроить сеть автоматически с помощью
#. Tag: para
#: random-bits.xml:792
#, no-c-format
-msgid "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
-msgstr "IP адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
+msgid ""
+"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
+msgstr ""
+"IP адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
#. Tag: para
#: random-bits.xml:797
@@ -1688,7 +1679,8 @@ msgstr "IP адрес: <userinput><replaceable>192.168.0.1</replaceable></userin
msgid ""
"Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
"userinput>"
-msgstr "Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
+msgstr ""
+"Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
#. Tag: para
#: random-bits.xml:803
@@ -1700,3 +1692,20 @@ msgstr ""
"Адреса серверов имён: можно указать те же адреса что и для источника "
"(смотрите <filename>/etc/resolv.conf</filename>)"
+#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "В Linux в каталоге <filename>/dev</filename> содержатся различные "
+#~ "специальные файлы. Эти файлы называются файлами устройств. Доступ к "
+#~ "устройствам в мире Unix отличается от того, как это сделано в других "
+#~ "операционных системах. Здесь это делается через специальный файл, который "
+#~ "в действительности обслуживается драйвером, осуществляющим доступ к "
+#~ "устройству. Файл устройства &mdash; это интерфейс к реальным системным "
+#~ "компонентам. Файлы в <filename>/dev</filename> также и ведут себя по-"
+#~ "другому. Ниже перечислены самые важные файлы устройств."
diff --git a/po/sv/boot-new.po b/po/sv/boot-new.po
index 61ad7f896..da5b9a47d 100644
--- a/po/sv/boot-new.po
+++ b/po/sv/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-15 18:07+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -359,17 +359,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -379,9 +379,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"För partitioner som är krypterade via loop-AES kommer du att bli visad "
"följande prompt under uppstarten: <informalexample><screen>\n"
@@ -401,14 +401,33 @@ msgstr ""
"filename> på ditt nya system."
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
#, no-c-format
msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"Inga tecken (inte ens stjärnor) kommer att visas när lösenfrasen matas in. "
"Var försiktig, du har endast <emphasis>ett försök</emphasis>. Om du matar in "
@@ -417,7 +436,7 @@ msgstr ""
"Se <xref linkend=\"crypto-troubleshooting\"/> för ytterligare information."
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
@@ -425,25 +444,37 @@ msgstr ""
"normalt."
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "ATTGÖRA: skriv något när det fungerar."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "Problemlösning"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -455,7 +486,7 @@ msgstr ""
"Det finns ett flertal olika situationer."
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -467,7 +498,7 @@ msgstr ""
"och försöka igen."
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -495,7 +526,7 @@ msgstr ""
"om att ange lösenfrasen för denna volym."
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -522,7 +553,7 @@ msgstr ""
"på vanligt sätt:"
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -532,10 +563,10 @@ msgstr ""
"replaceable></userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -561,13 +592,13 @@ msgstr ""
"efterfrågas."
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "Logga in"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -579,7 +610,7 @@ msgstr ""
"valde under installationsprocessen. Ditt system är nu klart att användas."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -593,7 +624,7 @@ msgstr ""
"de olika dokumentationstyperna. Här är ett par startpunkter."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -609,7 +640,7 @@ msgstr ""
"share/doc/apt/guide.html/index.html</filename>."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -626,7 +657,7 @@ msgstr ""
"HTML/index.html</filename>."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -638,7 +669,7 @@ msgstr ""
"och en punkt (punkten står för aktuell katalog)."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -664,7 +695,7 @@ msgstr ""
"en speciell bokstav, skriv bokstaven och tryck två gånger på tabulatorn."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -673,6 +704,9 @@ msgstr ""
"För en mer komplett introduktion till Debian och GNU/Linux, se <filename>/"
"usr/share/doc/debian-guide/html/noframes/index.html</filename>."
+#~ msgid "TODO: write something once it works."
+#~ msgstr "ATTGÖRA: skriv något när det fungerar."
+
#~ msgid "Configuring Your Time Zone"
#~ msgstr "Konfigurera din tidszon"
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index eb2ef8bfa..d0e62e54a 100644
--- a/po/sv/random-bits.po
+++ b/po/sv/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-15 18:12+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -30,20 +30,14 @@ msgstr "Linux-enheter"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"I Linux har man olika specialfiler i <filename>/dev</filename>. De här "
-"filerna kallas för enhetsfiler. I Unix-världen skiljer sig åtkomst mot "
-"maskinvaran. Där har du en specialfil som faktiskt kör en drivrutin som i "
-"sin tur kommer åt maskinvaran. Enhetsfilen är ett gränssnitt till den "
-"faktiska systemkomponenten. Filer under <filename>/dev</filename> uppträder "
-"olikt vanliga filer. Nedan är de mest viktiga enhetsfilerna listade."
#. Tag: filename
#: random-bits.xml:27
@@ -305,8 +299,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "Allting som pekas till den här enheten kommer att försvinna"
#. Tag: filename
@@ -1682,6 +1676,23 @@ msgstr ""
"<filename>/etc/resolv.conf</filename>)"
#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "I Linux har man olika specialfiler i <filename>/dev</filename>. De här "
+#~ "filerna kallas för enhetsfiler. I Unix-världen skiljer sig åtkomst mot "
+#~ "maskinvaran. Där har du en specialfil som faktiskt kör en drivrutin som i "
+#~ "sin tur kommer åt maskinvaran. Enhetsfilen är ett gränssnitt till den "
+#~ "faktiska systemkomponenten. Filer under <filename>/dev</filename> "
+#~ "uppträder olikt vanliga filer. Nedan är de mest viktiga enhetsfilerna "
+#~ "listade."
+
+#~ msgid ""
#~ "Boot the installation media. The installation needs to be run in expert "
#~ "mode; enter <userinput>expert</userinput> at the boot prompt. Below are "
#~ "the answers that should be given during various stages of the "
diff --git a/po/vi/boot-new.po b/po/vi/boot-new.po
index 1c1723f5d..da74b21a6 100644
--- a/po/vi/boot-new.po
+++ b/po/vi/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: boot-new\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-15 23:26+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -366,17 +366,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -386,9 +386,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"Đối với phân vùng được mật mã thông qua <filename>loop-AES</filename>, tiến "
"trình khởi động sẽ hiển thị dấu nhắc này: <informalexample><screen>\n"
@@ -408,14 +408,33 @@ msgstr ""
"filename> của hệ thống mới."
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
#, no-c-format
msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"Không có ký tự nào (ngay cả dấu sao) sẽ được hiển thị trong khi nhập cụm từ "
"mật khẩu. Hãy cẩn thận: bạn có thể nhập cụm từ mật khẩu này <emphasis>chỉ "
@@ -424,7 +443,7 @@ msgstr ""
"tới. Xem <xref linkend=\"crypto-troubleshooting\"/> để tìm thông tin thêm."
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
@@ -433,25 +452,37 @@ msgstr ""
# Name: don't translate / Tên: đừng dịch
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "TODO: (Cần làm: chưa ghi bằng tiếng Anh)"
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "Giải đáp thắc mắc"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -463,7 +494,7 @@ msgstr ""
"khi khởi động. Có vài trường hợp có thể."
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -475,7 +506,7 @@ msgstr ""
"máy tính để thử lại."
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -503,7 +534,7 @@ msgstr ""
"nhắc nhập cụm từ mật khẩu dành cho khối tin này."
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -530,7 +561,7 @@ msgstr ""
"được, bạn có khả năng đơn giản gắn kết những khối tin bằng cách bình thường."
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -540,10 +571,10 @@ msgstr ""
"userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -569,13 +600,13 @@ msgstr ""
"khẩu chủ được yêu cầu."
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "Đăng nhập"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -587,7 +618,7 @@ msgstr ""
"trình cài đặt. Hệ thống của bạn lúc bây giờ sẵn sàng sử dụng."
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -601,7 +632,7 @@ msgstr ""
"đầu đọc."
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -617,7 +648,7 @@ msgstr ""
"trong <filename>/usr/share/doc/apt/guide.html/index.html</filename>."
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -634,7 +665,7 @@ msgstr ""
"doc/HTML/index.html</filename>."
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -647,7 +678,7 @@ msgstr ""
"dấu chấm theo sau (dấu chấm tiêu biểu thư mục hiện có)."
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -674,7 +705,7 @@ msgstr ""
"hai dấu cách kiểu Tab."
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -683,6 +714,9 @@ msgstr ""
"Để tìm giới thiệu hoàn tất hơn về Debian và GNU/LInux, xem <filename>/usr/"
"share/doc/debian-guide/html/noframes/index.html</filename>."
+#~ msgid "TODO: write something once it works."
+#~ msgstr "TODO: (Cần làm: chưa ghi bằng tiếng Anh)"
+
#~ msgid "Debian Post-Boot (Base) Configuration"
#~ msgstr "Cấu hình Hậu Khởi động (Cơ bản) Debian"
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index a6a378a50..d7bcbfd3c 100644
--- a/po/vi/random-bits.po
+++ b/po/vi/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-08-02 22:08+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -32,21 +32,14 @@ msgstr "Thiết bị Linux"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"Trong Linux có một số tập tin đặc biệt nằm trong thư mục <filename>/dev</"
-"filename>. Những tập tin này được gọi như là tập tin thiết bị. Trong thế "
-"giới UNIX có cách khác truy cập phần cứng. Tại đó có một tập tin đặc biệt mà "
-"thật sự chạy trình điều khiển mà lần lượt truy cập phần cứng. Trình thiết bị "
-"là giao diện vào thành phần hệ thống thật. Tập tin nằm dưới thư mục "
-"<filename>/dev</filename> cũng ứng xử khác với tập tin chuẩn. Bên dưới có "
-"danh sách các tập tin thiết bị quan trọng nhất."
#. Tag: filename
#: random-bits.xml:27
@@ -308,8 +301,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "Mọi gì được chỉ tới thiết bị này sẽ mất"
#. Tag: filename
@@ -1624,10 +1617,18 @@ msgid ""
"irq=<replaceable>7</replaceable>\n"
"</screen></informalexample> Below are the answers that should be given "
"during various stages of the installation."
-msgstr "Khởi động vật chứa cài đặt. Cần phải chạy tiến trình cài đặt bằng chế độ nhà chuyên môn: hãy nhập <userinput>expert</userinput> vào dấu nhắc khởi động. Nếu bạn cần đặt tham số cho mô-đun hạt nhân, cũng cần phải làm như thế tại dấu nhắc khởi động. Chẳng hạn, để khởi động trình cài đặt và đặt giá trị cho những tùy chọn <quote>io</quote> và <quote>irq</quote> cho mô-đun <filename>partport_pc</filename>, hãy nhập dãy dưới vào dấu nhắc khởi động:<informalexample><screen>\n"
+msgstr ""
+"Khởi động vật chứa cài đặt. Cần phải chạy tiến trình cài đặt bằng chế độ nhà "
+"chuyên môn: hãy nhập <userinput>expert</userinput> vào dấu nhắc khởi động. "
+"Nếu bạn cần đặt tham số cho mô-đun hạt nhân, cũng cần phải làm như thế tại "
+"dấu nhắc khởi động. Chẳng hạn, để khởi động trình cài đặt và đặt giá trị cho "
+"những tùy chọn <quote>io</quote> và <quote>irq</quote> cho mô-đun "
+"<filename>partport_pc</filename>, hãy nhập dãy dưới vào dấu nhắc khởi động:"
+"<informalexample><screen>\n"
"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
"irq=<replaceable>7</replaceable>\n"
-"</screen></informalexample>Bên dưới có những trả lời cần nhập trong những giai đoạn khác nhau của tiến trình cài đặt."
+"</screen></informalexample>Bên dưới có những trả lời cần nhập trong những "
+"giai đoạn khác nhau của tiến trình cài đặt."
#. Tag: guimenuitem
#: random-bits.xml:748
@@ -1717,3 +1718,20 @@ msgstr ""
"Các địa chỉ của máy phục vụ tên: bạn có khả năng nhập cùng những địa chỉ "
"được dùng trên máy tính nguồn (xem tập tin cấu hình <filename>/etc/resolv."
"conf</filename>)"
+
+#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "Trong Linux có một số tập tin đặc biệt nằm trong thư mục <filename>/dev</"
+#~ "filename>. Những tập tin này được gọi như là tập tin thiết bị. Trong thế "
+#~ "giới UNIX có cách khác truy cập phần cứng. Tại đó có một tập tin đặc biệt "
+#~ "mà thật sự chạy trình điều khiển mà lần lượt truy cập phần cứng. Trình "
+#~ "thiết bị là giao diện vào thành phần hệ thống thật. Tập tin nằm dưới thư "
+#~ "mục <filename>/dev</filename> cũng ứng xử khác với tập tin chuẩn. Bên "
+#~ "dưới có danh sách các tập tin thiết bị quan trọng nhất."
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index aa7af687b..73db5e785 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-07-13 14:42+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -327,17 +327,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
#. Tag: para
#: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -347,9 +347,9 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
msgstr ""
"通过 loop-AES 加密的分区,启动的时候会有下面的提示信息:"
"<informalexample><screen>\n"
@@ -365,45 +365,76 @@ msgstr ""
"filename> 里面找到它。"
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
#, no-c-format
msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
"输入密码时不会有字符(包括星号)回显。注意,您只有 <emphasis>一次机会</"
"emphasis>。如果密码输错,将显示错误信息,但启动过程将跳过该卷进入到下一个文件"
"系统。请参阅 <xref linkend=\"crypto-troubleshooting\"/> 了解更多信息。"
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr "输入密码之后,启动过程与通常情况相同。"
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
-msgstr "TODO: write something once it works."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr "故障处理"
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -414,7 +445,7 @@ msgstr ""
"况。"
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -425,7 +456,7 @@ msgstr ""
"动计算机再试一次。"
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -451,7 +482,7 @@ msgstr ""
"于需要为该卷输入密码。"
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -474,7 +505,7 @@ msgstr ""
"就可以按普通的方法加载这些卷:"
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -484,10 +515,10 @@ msgstr ""
"userinput>"
#. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -508,13 +539,13 @@ msgstr ""
"时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "登录"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -525,7 +556,7 @@ msgstr ""
"在您的系统就能使用了。"
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -537,7 +568,7 @@ msgstr ""
"文档系统,由不同类型的文档组成。这里是一些出发点。"
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -551,7 +582,7 @@ msgstr ""
"统,位于 <filename>/usr/share/doc/apt/guide.html/index.html</filename>。"
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -567,7 +598,7 @@ msgstr ""
"index.html</filename> 文档索引。"
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -578,7 +609,7 @@ msgstr ""
"<userinput>lynx</userinput> 后面是空格加一个点(点是指当前目录)。"
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -601,7 +632,7 @@ msgstr ""
"母,再是两个 tab。"
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -609,3 +640,6 @@ msgid ""
msgstr ""
"了解更多的 Debian 和 GNU/Linux,请参阅 <filename>/usr/share/doc/debian-guide/"
"html/noframes/index.html</filename>。"
+
+#~ msgid "TODO: write something once it works."
+#~ msgstr "TODO: write something once it works."
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index ab046e631..668ccde02 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2006-08-02 19:35+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -27,19 +27,14 @@ msgstr "Linux 里的设备"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"在 Linux 里,您会在 <filename>/dev</filename> 发现许多很特别的文件。这些文件"
-"被称为设备文件。在 Unix 世界里,访问硬件的方式有些不一样。这些特别的文件的背"
-"后其实运行着驱动程序,而正是驱动程序控制着硬件。设备文件就是访问真实的系统部"
-"件的接口。<filename>/dev</filename> 目录下的文件的各种特性也和普通文件大相径"
-"庭。下面列举了最重要的一些设备文件。"
#. Tag: filename
#: random-bits.xml:27
@@ -301,8 +296,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "所有指向该设备的东西都会消失"
#. Tag: filename
@@ -379,7 +374,12 @@ msgid ""
"mini/3-Button-Mouse.gz</filename>, <userinput>man gpm</userinput>, "
"<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and <ulink url=\"&url-xorg;"
"current/doc/html/mouse.html\">README.mouse</ulink>."
-msgstr "如果禁用了 gpm,或者因为某些原因没有安装,请确保设置 X 从鼠标设备,比如 /dev/psaux 上直接读取数据。详情情况,请参阅三键鼠标的 mini-Howto <filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、<userinput>man gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</filename> 以及 <ulink url=\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>。"
+msgstr ""
+"如果禁用了 gpm,或者因为某些原因没有安装,请确保设置 X 从鼠标设备,比如 /dev/"
+"psaux 上直接读取数据。详情情况,请参阅三键鼠标的 mini-Howto <filename>/usr/"
+"share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、<userinput>man "
+"gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</filename> 以及 <ulink "
+"url=\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>。"
#. Tag: para
#: random-bits.xml:158
@@ -748,9 +748,12 @@ msgid ""
"</screen></informalexample> To create an ext2 file system instead, omit "
"<userinput>-j</userinput>."
msgstr ""
-"在分区上创建文件系统。举例来说,要在 <filename>/dev/hda6</filename> 分区(以后的例子中,将把它作为 root 分区)建立一个 ext3 格式的文件系统: <informalexample><screen>\n"
+"在分区上创建文件系统。举例来说,要在 <filename>/dev/hda6</filename> 分区(以后"
+"的例子中,将把它作为 root 分区)建立一个 ext3 格式的文件系统: "
+"<informalexample><screen>\n"
"# mke2fs -j /dev/hda6\n"
-"</screen></informalexample> 要建立 ext2 格式的文件系统,去掉 <userinput>-j</userinput>。"
+"</screen></informalexample> 要建立 ext2 格式的文件系统,去掉 <userinput>-j</"
+"userinput>。"
#. Tag: para
#: random-bits.xml:340
@@ -815,7 +818,15 @@ msgid ""
"command>. </para> </footnote>. Install <command>wget</command> and "
"<command>ar</command> if they aren't already on your current system, then "
"download and install <command>debootstrap</command>."
-msgstr "Debian 安装程序使用的工具,同时也为安装 Debian 基本系统的官方方法采用,是 <command>debootstrap</command>。它调用了 <command>wget</command> 和 <command>ar</command>,而其他的仅依赖 <classname>/bin/sh</classname> 和基本的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令,像 <command>sed</command>、<command>grep</command>、<command>tar</command> 和 <command>gzip</command>。</para> </footnote>。如果您的系统里还没有 <command>wget</command> 和 <command>ar</command>,先安装它们,然后下载并安装 <command>debootstrap</command>。"
+msgstr ""
+"Debian 安装程序使用的工具,同时也为安装 Debian 基本系统的官方方法采用,是 "
+"<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
+"<command>ar</command>,而其他的仅依赖 <classname>/bin/sh</classname> 和基本"
+"的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令,像 "
+"<command>sed</command>、<command>grep</command>、<command>tar</command> 和 "
+"<command>gzip</command>。</para> </footnote>。如果您的系统里还没有 "
+"<command>wget</command> 和 <command>ar</command>,先安装它们,然后下载并安装 "
+"<command>debootstrap</command>。"
#. Tag: para
#: random-bits.xml:396
@@ -1196,10 +1207,14 @@ msgid ""
"other than ASCII or latin1, please consult the appropriate localization "
"HOWTO."
msgstr ""
-"要设置您的 locale 设定,以便使用英语以外的其它语言,就需要安装提供 <classname>locales</classname> 支持软件包,然后配置: <informalexample><screen>\n"
+"要设置您的 locale 设定,以便使用英语以外的其它语言,就需要安装提供 "
+"<classname>locales</classname> 支持软件包,然后配置: "
+"<informalexample><screen>\n"
"# aptitude install locales\n"
"# dpkg-reconfigure locales\n"
-"</screen></informalexample> 注意:在此之前必须配置好 apt,创建 source.list 并执行 <command>aptitude update</command>。在使用非 ASCII 或 latin1 的字符集的 locale 之前,请先参阅相应的本地化指南(localization HOWTO)。"
+"</screen></informalexample> 注意:在此之前必须配置好 apt,创建 source.list 并"
+"执行 <command>aptitude update</command>。在使用非 ASCII 或 latin1 的字符集的 "
+"locale 之前,请先参阅相应的本地化指南(localization HOWTO)。"
#. Tag: title
#: random-bits.xml:582
@@ -1231,7 +1246,10 @@ msgid ""
"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
"arch-etc</replaceable>"
-msgstr "# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
+"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
+"arch-etc</replaceable>"
#. Tag: title
#: random-bits.xml:598
@@ -1247,7 +1265,10 @@ msgid ""
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
-msgstr "要让您的 &debian; 系统能够启动,还要创建您的 boot loader,好让它能加载已安装的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader,因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
+msgstr ""
+"要让您的 &debian; 系统能够启动,还要创建您的 boot loader,好让它能加载已安装"
+"的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
+"loader,因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
#. Tag: para
#: random-bits.xml:606
@@ -1358,7 +1379,10 @@ msgid ""
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
-msgstr "本节将说明在没有以太网卡的情况下,如何通过一条 Null-Modem 线(也称为 Null-Printer 线),连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到具有 Debian 镜像的网络(例如,互联网)。"
+msgstr ""
+"本节将说明在没有以太网卡的情况下,如何通过一条 Null-Modem 线(也称为 Null-"
+"Printer 线),连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到"
+"具有 Debian 镜像的网络(例如,互联网)。"
#. Tag: para
#: random-bits.xml:661
@@ -1516,8 +1540,12 @@ msgid ""
"</screen></informalexample> Below are the answers that should be given "
"during various stages of the installation."
msgstr ""
-"启动安装介质。安装需要运行在 expert 模式; 输入 <userinput>expert</userinput> 到启动提示符。如果您需要为内核模块设置参数,同样要在启动提示符下输入。例如,要启动安装程序,并为 parport_pc 模块的 <quote>io</quote> 和 <quote>irq</quote> 选项设置值,在启动提示符后面输入:<informalexample><screen>\n"
-"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc.irq=<replaceable>7</replaceable>\n"
+"启动安装介质。安装需要运行在 expert 模式; 输入 <userinput>expert</userinput> "
+"到启动提示符。如果您需要为内核模块设置参数,同样要在启动提示符下输入。例如,"
+"要启动安装程序,并为 parport_pc 模块的 <quote>io</quote> 和 <quote>irq</"
+"quote> 选项设置值,在启动提示符后面输入:<informalexample><screen>\n"
+"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
+"irq=<replaceable>7</replaceable>\n"
"</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
#. Tag: guimenuitem
@@ -1605,3 +1633,18 @@ msgid ""
msgstr ""
"Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
"resolv.conf</filename>)"
+
+#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "在 Linux 里,您会在 <filename>/dev</filename> 发现许多很特别的文件。这些文"
+#~ "件被称为设备文件。在 Unix 世界里,访问硬件的方式有些不一样。这些特别的文件"
+#~ "的背后其实运行着驱动程序,而正是驱动程序控制着硬件。设备文件就是访问真实的"
+#~ "系统部件的接口。<filename>/dev</filename> 目录下的文件的各种特性也和普通文"
+#~ "件大相径庭。下面列举了最重要的一些设备文件。"
diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po
index b611cddf4..83e7dfb1c 100644
--- a/po/zh_TW/boot-new.po
+++ b/po/zh_TW/boot-new.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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2005-07-18 00:22+0800\n"
"Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
"Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -326,17 +326,17 @@ msgstr ""
#. Tag: title
#: boot-new.xml:203
#, no-c-format
-msgid "loop-AES"
+msgid "dm-crypt"
msgstr ""
#. Tag: para
#: boot-new.xml:205
#, no-c-format
msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, <replaceable>X</"
"replaceable> is the number of the loop device. You are now probably "
"wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -346,48 +346,79 @@ msgid ""
"this volume. If you set up more than one encrypted volume during the "
"installation, the notes you wrote down as the last step in <xref linkend="
"\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:227
+#, no-c-format
+msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
msgstr ""
#. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:236 boot-new.xml:261
#, no-c-format
msgid ""
"No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
msgstr ""
#. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
#, no-c-format
msgid "After entering all passphrases the boot should continue as usual."
msgstr ""
#. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
#, no-c-format
-msgid "dm-crypt"
+msgid "loop-AES"
msgstr ""
#. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
#, no-c-format
-msgid "TODO: write something once it works."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
msgstr ""
#. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
#, no-c-format
msgid "Troubleshooting"
msgstr ""
#. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
#, no-c-format
msgid ""
"If some of the encrypted volumes could not be mounted because a wrong "
@@ -396,7 +427,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
#, no-c-format
msgid ""
"The first case concerns the root partition. When it is not mounted "
@@ -405,7 +436,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
#, no-c-format
msgid ""
"The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -422,7 +453,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
#, no-c-format
msgid ""
"For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -438,7 +469,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -446,10 +477,10 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-new.xml:303
+#: boot-new.xml:327
#, no-c-format
msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
@@ -463,13 +494,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
#, no-c-format
msgid "Log In"
msgstr "登入"
#. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
#, fuzzy, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -480,7 +511,7 @@ msgstr ""
"您的系統就能使用了。"
#. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -492,7 +523,7 @@ msgstr ""
"由不同類型的文件組成。接下來將做簡略介紹。"
#. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -507,7 +538,7 @@ msgstr ""
"filename>。"
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -522,7 +553,7 @@ msgstr ""
"覽 <filename>/usr/share/doc/HTML/index.html</filename> 文件索引。"
#. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
#, no-c-format
msgid ""
"One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -533,7 +564,7 @@ msgstr ""
"<userinput>lynx</userinput> 後面加上空格和一個點 (點是指目前目錄)。"
#. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
@@ -556,7 +587,7 @@ msgstr ""
"鍵。"
#. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
#, no-c-format
msgid ""
"For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index f57620d75..5495166a4 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.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: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
"PO-Revision-Date: 2005-07-18 14:20+0800\n"
"Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
"Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -27,19 +27,14 @@ msgstr "Linux 裡的設備"
#: random-bits.xml:12
#, no-c-format
msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(part of the Linux kernel) which in turn accesses the hardware. Another, "
+"less common, type of device file is the named <firstterm>pipe</firstterm>. "
+"The most important device files are listed in the tables below."
msgstr ""
-"在 Linux 裡,您會在 <filename>/dev</filename>發現許多很特別的檔案。這些檔案被"
-"稱為設備檔。在 Unix 世界裡,存取硬體的方式有些不一樣。這些特別的檔案的背後其"
-"實運行著驅動程式,而正是驅動程式控制著硬體。設備檔就是存取真實的系統元件的介"
-"面。<filename>/dev</filename> 目錄下的檔案的各種特性也和普通檔案大相逕庭。下"
-"面列舉了最重要的一些設備檔。"
#. Tag: filename
#: random-bits.xml:27
@@ -301,8 +296,8 @@ msgstr "null"
#. Tag: entry
#: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
msgstr "所有指向該設備的東西都會消失"
#. Tag: filename
@@ -1573,6 +1568,21 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "在 Linux 裡,您會在 <filename>/dev</filename>發現許多很特別的檔案。這些檔"
+#~ "案被稱為設備檔。在 Unix 世界裡,存取硬體的方式有些不一樣。這些特別的檔案的"
+#~ "背後其實運行著驅動程式,而正是驅動程式控制著硬體。設備檔就是存取真實的系統"
+#~ "元件的介面。<filename>/dev</filename> 目錄下的檔案的各種特性也和普通檔案大"
+#~ "相逕庭。下面列舉了最重要的一些設備檔。"
+
+#~ msgid ""
#~ "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>"
#~ msgstr ""
#~ "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>"