Update Japanese translations for r62867.

3 files changed, 43 insertions, 194 deletions

diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 98c2d8c7f..ea1b3610f 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-04-07 00:13+0000\n"
-"PO-Revision-Date: 2010-03-03 23:17+0900\n"
+"PO-Revision-Date: 2010-04-07 23:30+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -324,18 +324,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, fuzzy, no-c-format
-#| msgid ""
-#| "To boot the SS4000-E, first load the Debian-provided firmware image "
-#| "(ss4000e.pkg) through the SS4000-E's web interface (go to "
-#| "<quote>administration</quote>, then to <quote>firmware</quote>, and "
-#| "upload the image). Next, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a Debian GNU/Linux is to use the "
-#| "<command>cu</command> program, in the package of the same name. Assuming "
-#| "the serial port on your computer is to be found on <filename>/dev/ttyS0</"
-#| "filename>, use the following command line:"
+#, no-c-format
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -345,15 +334,11 @@ msgid ""
 "computer is to be found on <filename>/dev/ttyS0</filename>, use the "
 "following command line:"
 msgstr ""
-"SS4000-E を起動するには、まず Debian が提供するファームウェアイメージ "
-"(ss4000e.pkg) を、SS4000-E のWeb インターフェース (<quote>administration</"
-"quote> から <quote>firmware</quote> に行き、イメージをアップロード) からロー"
-"ドします。次にシリアルのヌルモデルケーブルとリボンケーブルを使用し、SS4000-E "
-"のシリアルポートに接続し、再起動してください。マシンと通信するにはシリアル"
-"ターミナルアプリケーションが必要です。Debian GNU/Linux では、<command>cu</"
-"command> プログラム (パッケージは同名) を使用すると良いでしょう。あなたのコン"
-"ピュータで、シリアルポートが <filename>/dev/ttyS0</filename> として見えている"
-"場合、以下のコマンドラインを使用してください。"
+"SS4000-E を起動するには、シリアルのヌルモデルケーブルとリボンケーブルを使用"
+"し、SS4000-E のシリアルポートに接続し、再起動してください。Debian GNU/Linux "
+"では、<command>cu</command> プログラム (パッケージは同名) を使用すると良いで"
+"しょう。あなたのコンピュータで、シリアルポートが <filename>/dev/ttyS0</"
+"filename> として見えている場合、以下のコマンドラインを使用してください。"
 
 #. Tag: screen
 #: boot-installer.xml:257
@@ -395,13 +380,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:273
-#, fuzzy, no-c-format
-#| msgid ""
-#| "At this point, hit Control-C to interrupt the boot loader<footnote id="
-#| "\"arm-s4ke-sec\"> <para> Note that you have only one second to do so; if "
-#| "you miss this window, just powercycle the machine and try again. </para> "
-#| "</footnote>. This will give you the RedBoot prompt. Enter the following "
-#| "command:"
+#, no-c-format
 msgid ""
 "At this point, hit Control-C to interrupt the boot loader<footnote id=\"arm-"
 "s4ke-sec\"> <para> Note that you have only one second to do so; if you miss "
@@ -416,20 +395,15 @@ msgstr ""
 
 #. Tag: screen
 #: boot-installer.xml:286
-#, fuzzy, no-c-format
-#| msgid ""
-#| "fis load ramdisk.gz\n"
-#| "fis load zImage\n"
-#| "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-#| "0x01800000"
+#, no-c-format
 msgid ""
 "load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
 "load -v -r -b 0x01008000 -m ymodem zImage\n"
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 msgstr ""
-"fis load ramdisk.gz\n"
-"fis load zImage\n"
+"load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
+"load -v -r -b 0x01008000 -m ymodem zImage\n"
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 
@@ -444,6 +418,12 @@ msgid ""
 "program, and run <command>sb initrd.gz</command> or <command>sb vmlinuz</"
 "command>."
 msgstr ""
+"毎回の <command>load</command> コマンドの後、YMODEM プロトコルを使用してファ"
+"イルが送信されることを、システムは期待します。cu を使用する際、"
+"<classname>lrzsz</classname> パッケージがインストールされていることを確認して"
+"ください。それから enter を叩き、<quote>~&lt;</quote> エスケープシーケンスが"
+"続く外部プログラムを起動します。そして、<command>sb initrd.gz</command> や "
+"<command>sb vmlinuz</command> を実行します。"
 
 #. Tag: para
 #: boot-installer.xml:297
@@ -453,6 +433,9 @@ msgid ""
 "rather than YMODEM. This is faster, but requires a working HTTP server on "
 "the network. To do so, first swith the bootloader to RAM mode:"
 msgstr ""
+"他には、YMODEM ではなく HTTP を用いて、カーネルや RAM ディスクをロードできま"
+"す。この方が速いのですが、ネットワーク上で動作している HTTP サーバが必要にな"
+"ります。こうするには、まず速やかにブートローダを RAM モードにしてください。"
 
 #. Tag: screen
 #: boot-installer.xml:303
@@ -461,6 +444,8 @@ msgid ""
 "fis load rammode\n"
 "g"
 msgstr ""
+"fis load rammode\n"
+"g"
 
 #. Tag: para
 #: boot-installer.xml:305
@@ -470,21 +455,21 @@ msgid ""
 "RAM and restarts it from there. Not doing this step will cause the system to "
 "hang in the necessary ip_address step that comes next."
 msgstr ""
+"これは外見上、機械を再始動しますが、実際には、reboot を RAM にロードし、そこ"
+"から再始動します。このステップを踏まないと、次に来る必要な ip_address ステッ"
+"プで、システムがハングする原因になるでしょう。"
 
 #. Tag: para
 #: boot-installer.xml:311
 #, no-c-format
 msgid "You will need to hit Ctrl-C again to interrupt the boot. Then:"
 msgstr ""
+"ブートに割り込みをかけるため、もう一度 Ctrl-C を叩く必要があるでしょう。その"
+"後、以下のようにします。"
 
 #. Tag: screen
 #: boot-installer.xml:315
-#, fuzzy, no-c-format
-#| msgid ""
-#| "fis load ramdisk.gz\n"
-#| "fis load zImage\n"
-#| "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-#| "0x01800000"
+#, no-c-format
 msgid ""
 "ip_address -l 192.168.2.249 -h 192.168.2.4\n"
 "load -v -r -b 0x01800000 -m http /initrd.gz\n"
@@ -492,8 +477,9 @@ msgid ""
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 msgstr ""
-"fis load ramdisk.gz\n"
-"fis load zImage\n"
+"ip_address -l 192.168.2.249 -h 192.168.2.4\n"
+"load -v -r -b 0x01800000 -m http /initrd.gz\n"
+"load -v -r -b 0x01008000 -m http /zImage\n"
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 
@@ -501,7 +487,7 @@ msgstr ""
 #: boot-installer.xml:317
 #, no-c-format
 msgid "The installer will now start as usual."
-msgstr ""
+msgstr "今度は通常のように、インストーラが起動します。"
 
 #. Tag: title
 #: boot-installer.xml:330 boot-installer.xml:798 boot-installer.xml:1456
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 5d6b931f8..6f7fe0fe0 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-03-28 00:13+0000\n"
-"PO-Revision-Date: 2010-03-03 23:24+0900\n"
+"PO-Revision-Date: 2010-04-01 22:44+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1754,86 +1754,7 @@ msgstr "パーティション分割の例"
 
 #. Tag: screen
 #: preseed.xml:880
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# This is only honoured if partman-auto/method (below) is not set.\n"
-#| "#d-i partman-auto/init_automatically_partition select biggest_free\n"
-#| "\n"
-#| "# Alternatively, you may specify a disk to partition. If the system has "
-#| "only\n"
-#| "# one disk the installer will default to using that, but otherwise the "
-#| "device\n"
-#| "# name must be given in traditional, non-devfs format (so e.g. /dev/hda "
-#| "or\n"
-#| "# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "#d-i partman-auto/disk string /dev/sda\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are:\n"
-#| "# - regular: use the usual partition types for your architecture\n"
-#| "# - lvm:     use LVM to partition the disk\n"
-#| "# - crypto:  use LVM within an encrypted partition\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# The same applies to pre-existing software RAID array:\n"
-#| "d-i partman-md/device_remove_md boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "\n"
-#| "# You can choose one of the three predefined partitioning recipes:\n"
-#| "# - atomic: all files in one partition\n"
-#| "# - home:   separate /home partition\n"
-#| "# - multi:  separate /home, /usr, /var, and /tmp partitions\n"
-#| "d-i partman-auto/choose_recipe select atomic\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string                         \\\n"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# The full recipe format is documented in the file partman-auto-recipe."
-#| "txt\n"
-#| "# included in the 'debian-installer' package or available from D-I "
-#| "source\n"
-#| "# repository. This also documents how to specify settings such as file\n"
-#| "# system labels, volume group names and which physical devices to "
-#| "include\n"
-#| "# in a volume group.\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman-partitioning/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition select finish\n"
-#| "d-i partman/confirm boolean true"
+#, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -1978,7 +1899,8 @@ msgstr ""
 "# that you told it what to do using one of the methods above.\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:884
@@ -2020,58 +1942,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# The method should be set to \"raid\".\n"
-#| "#d-i partman-auto/method string raid\n"
-#| "# Specify the disks to be partitioned. They will all get the same "
-#| "layout,\n"
-#| "# so this will only work if the disks are the same size.\n"
-#| "#d-i partman-auto/disk string /dev/sda /dev/sdb\n"
-#| "\n"
-#| "# Next you need to specify the physical partitions that will be used. \n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "#      multiraid ::                                         \\\n"
-#| "#              1000 5000 4000 raid                          \\\n"
-#| "#                      $primary{ } method{ raid }           \\\n"
-#| "#              .                                            \\\n"
-#| "#              64 512 300% raid                             \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .                                            \\\n"
-#| "#              500 10000 1000000000 raid                    \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# Last you need to specify how the previously defined partitions will be\n"
-#| "# used in the RAID setup. Remember to use the correct partition numbers\n"
-#| "# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported;\n"
-#| "# devices are separated using \"#\".\n"
-#| "# Parameters are:\n"
-#| "# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
-#| "mountpoint&gt; \\\n"
-#| "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-#| "\n"
-#| "#d-i partman-auto-raid/recipe string \\\n"
-#| "#    1 2 0 ext3 /                    \\\n"
-#| "#          /dev/sda1#/dev/sdb1       \\\n"
-#| "#    .                               \\\n"
-#| "#    1 2 0 swap -                    \\\n"
-#| "#          /dev/sda5#/dev/sdb5       \\\n"
-#| "#    .                               \\\n"
-#| "#    0 2 0 ext3 /home                \\\n"
-#| "#          /dev/sda6#/dev/sdb6       \\\n"
-#| "#    .\n"
-#| "\n"
-#| "# For additional information see the file partman-auto-raid-recipe.txt\n"
-#| "# included in the 'debian-installer' package or available from D-I "
-#| "source\n"
-#| "# repository.\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation.\n"
-#| "d-i partman-md/confirm boolean true\n"
-#| "d-i partman-partitioning/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition select finish\n"
-#| "d-i partman/confirm boolean true"
+#, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2170,7 +2041,8 @@ msgstr ""
 "d-i partman-md/confirm boolean true\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:910
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 61b89701a..6d5ba90e8 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-03-22 00:13+0000\n"
-"PO-Revision-Date: 2010-03-03 23:25+0900\n"
+"PO-Revision-Date: 2010-04-01 22:49+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -5125,16 +5125,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:3264
-#, fuzzy, no-c-format
-#| msgid ""
-#| "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
-#| "<phrase arch=\"s390\">You</phrase> will be asked for a new password to be "
-#| "used for connecting to the installation system and for its confirmation. "
-#| "That's all. Now you should see a screen which instructs you to login "
-#| "remotely as the user <emphasis>installer</emphasis> with the password you "
-#| "just provided. Another important detail to notice on this screen is the "
-#| "fingerprint of this system. You need to transfer the fingerprint securely "
-#| "to the <quote>person who will continue the installation remotely</quote>."
+#, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
 "<phrase arch=\"s390\">You</phrase> will be asked for a new password to be "
@@ -5150,8 +5141,8 @@ msgstr ""
 "い。これで以上です。今、リモートでログインするよう促す画面が出ているはずで"
 "す。ユーザ名は <emphasis>installer</emphasis>、パスワードは先ほど入力した物を"
 "使用してください。この画面にある重要な細かい点として、このシステムの指紋 "
-"(fingerprint) があります。この指紋を<quote>リモートでインストールを続ける人</"
-"quote>に、安全に転送する必要があります。"
+"(fingerprint) があります。この指紋を、リモートでインストールを続ける人に、安"
+"全に転送する必要があります。"
 
 #. Tag: para
 #: using-d-i.xml:3276