diff options
| -rw-r--r-- | po/ja/boot-installer.po | 15 | ||||
| -rw-r--r-- | po/ja/hardware.po | 38 | ||||
| -rw-r--r-- | po/ja/install-methods.po | 107 | ||||
| -rw-r--r-- | po/ja/preseed.po | 141 | ||||
| -rw-r--r-- | po/ja/using-d-i.po | 28 | ||||
| -rw-r--r-- | po/ja/welcome.po | 10 | ||||
| -rw-r--r-- | po/ru/preparing.po | 68 |
7 files changed, 25 insertions, 382 deletions
diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po index f309f5100..648e5d81d 100644 --- a/po/ja/boot-installer.po +++ b/po/ja/boot-installer.po @@ -1649,13 +1649,6 @@ msgstr "" #. Tag: para #: boot-installer.xml:1141 #, no-c-format -#| msgid "" -#| "If you wish or need to add any boot parameters for either the installer " -#| "or the kernel, press &tabkey;. This will display the default boot command " -#| "for the selected menu entry and allow to add additional options. The help " -#| "screens (see below) list some common possible options. Press &enterkey; " -#| "to boot the installer with your options; pressing &escapekey; will return " -#| "you to the boot menu." msgid "" "If you wish or need to add any boot parameters for either the installer or " "the kernel, press &tabkey;. This will display the default boot command for " @@ -5190,14 +5183,6 @@ msgstr "" #. Tag: para #: boot-installer.xml:3741 #, no-c-format -#| msgid "" -#| "If your screen begins to show a weird picture while the kernel boots, eg. " -#| "pure white, pure black or colored pixel garbage, your system may contain " -#| "a problematic video card which does not switch to the framebuffer mode " -#| "properly. Then you can use the boot parameter <userinput>fb=false " -#| "video=vga16:off</userinput> to disable the framebuffer console. Only a " -#| "reduced set of languages will be available during the installation due to " -#| "limited console features. See <xref linkend=\"boot-parms\"/> for details." msgid "" "If your screen begins to show a weird picture while the kernel boots, eg. " "pure white, pure black or colored pixel garbage, your system may contain a " diff --git a/po/ja/hardware.po b/po/ja/hardware.po index b6e0b86a0..a1e186eac 100644 --- a/po/ja/hardware.po +++ b/po/ja/hardware.po @@ -73,9 +73,6 @@ msgstr "サポートするアーキテクチャ" #. Tag: para #: hardware.xml:42 #, no-c-format -#| msgid "" -#| "Debian &release; supports twelve major architectures and several " -#| "variations of each architecture known as <quote>flavors</quote>." msgid "" "Debian &release; supports eleven major architectures and several variations " "of each architecture known as <quote>flavors</quote>." @@ -2250,9 +2247,6 @@ msgstr "カーネルフレーバー" #. Tag: para #: hardware.xml:1152 #, no-c-format -#| msgid "" -#| "There are four flavours of the powerpc kernel in Debian, based on the CPU " -#| "type:" msgid "" "There are two flavours of the powerpc kernel in Debian, based on the CPU " "type:" @@ -2714,7 +2708,6 @@ msgstr "p640" #. Tag: title #: hardware.xml:1430 #, no-c-format -#| msgid "Nubus PowerMac subarchitecture (unsupported)" msgid "CHRP subarchitecture (unsupported)" msgstr "CHRP サブアーキテクチャ (未サポート)" @@ -2739,7 +2732,6 @@ msgstr "Pegasos I, Pegasos II" #. Tag: title #: hardware.xml:1459 #, no-c-format -#| msgid "Nubus PowerMac subarchitecture (unsupported)" msgid "APUS subarchitecture (unsupported)" msgstr "APUS サブアーキテクチャ (未サポート)" @@ -2981,11 +2973,6 @@ msgstr "ラップトップコンピュータ" #. Tag: para #: hardware.xml:1650 #, no-c-format -#| msgid "" -#| "Laptops are also supported. Laptops are often specialized or contain " -#| "proprietary hardware. To see if your particular laptop works well with " -#| "GNU/Linux, see the <ulink url=\"&url-x86-laptop;\">Linux Laptop pages</" -#| "ulink>" msgid "" "Laptops are also supported and nowadays most laptops work out of the box. In " "case a laptop contains specialized or proprietary hardware, some specific " @@ -3009,13 +2996,6 @@ msgstr "マルチプロセッサ" #. Tag: para #: hardware.xml:1663 #, no-c-format -#| msgid "" -#| "Multiprocessor support — also called <quote>symmetric " -#| "multiprocessing</quote> or SMP — is available for this " -#| "architecture. The standard Debian &release; kernel image was compiled " -#| "with SMP support. This should not prevent installation, since the SMP " -#| "kernel should boot on non-SMP systems; the kernel will simply cause a bit " -#| "more overhead." msgid "" "Multiprocessor support — also called <quote>symmetric multiprocessing</" "quote> or SMP — is available for this architecture. The standard " @@ -3051,13 +3031,6 @@ msgstr "" #. Tag: para #: hardware.xml:1687 #, no-c-format -#| msgid "" -#| "Multiprocessor support — also called <quote>symmetric " -#| "multiprocessing</quote> or SMP — is available for this " -#| "architecture. The standard Debian &release; kernel image was compiled " -#| "with <firstterm>SMP-alternatives</firstterm> support. This means that the " -#| "kernel will detect the number of processors (or processor cores) and will " -#| "automatically deactivate SMP on uniprocessor systems." msgid "" "Multiprocessor support — also called <quote>symmetric multiprocessing</" "quote> or SMP — is available for this architecture. The standard " @@ -3401,12 +3374,6 @@ msgstr "ワイヤレスネットワークカード" #. Tag: para #: hardware.xml:1910 #, no-c-format -#| msgid "" -#| "Wireless NICs are in general supported as well, with one big proviso. A " -#| "lot of wireless adapters require drivers that are either non-free or have " -#| "not been accepted into the official Linux kernel. These NICs can " -#| "generally be made to work under &debian;, but are not supported during " -#| "the installation." msgid "" "Wireless networking is in general supported as well and a growing number of " "wireless adapters is supported by the official Linux kernel, although many " @@ -3422,10 +3389,6 @@ msgstr "" #. Tag: para #: hardware.xml:1918 #, no-c-format -#| msgid "" -#| "If there is no other NIC you can use during the installation, it is still " -#| "possible to install &debian; using a full CD-ROM or DVD image. Use the " -#| "same procedure as described above for NICs that require firmware." msgid "" "The use of wireless networking during installation is still under " "development and whether it will work depends on the type of adaptor and the " @@ -3628,7 +3591,6 @@ msgstr "" #. Tag: title #: hardware.xml:2047 #, no-c-format -#| msgid "Drivers Requiring Firmware" msgid "Devices Requiring Firmware" msgstr "ファームウェアが必要なデバイス" diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po index 8cefe4720..69b911fb0 100644 --- a/po/ja/install-methods.po +++ b/po/ja/install-methods.po @@ -964,13 +964,6 @@ msgstr "" #. Tag: para #: install-methods.xml:671 #, no-c-format -#| msgid "" -#| "To prepare the USB stick, you will need a system where GNU/Linux is " -#| "already running and where USB is supported. You should ensure that the " -#| "usb-storage kernel module is loaded (<userinput>modprobe usb-storage</" -#| "userinput>) and try to find out which SCSI device the USB stick has been " -#| "mapped to (in this example <filename>/dev/sda</filename> is used). To " -#| "write to your stick, you may have to turn off its write protection switch." msgid "" "To prepare the USB stick, you will need a system where GNU/Linux is already " "running and where USB is supported. With current GNU/Linux systems the USB " @@ -994,9 +987,6 @@ msgstr "" #. Tag: para #: install-methods.xml:685 #, no-c-format -#| msgid "" -#| "Using this method will destroy anything already on the device. Make sure " -#| "that you use the correct device name for your USB stick." msgid "" "The procedures described in this section will destroy anything already on " "the device! Make very sure that you use the correct device name for your USB " @@ -1026,11 +1016,6 @@ msgstr "ファイルのコピー — 簡単な方法" #. Tag: para #: install-methods.xml:702 #, no-c-format -#| msgid "" -#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> " -#| "which contains all the installer files (including the kernel) as well as " -#| "<command>SYSLINUX</command> and its configuration file. You only have to " -#| "extract it directly to your USB stick:" msgid "" "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which " "contains all the installer files (including the kernel) <phrase arch=\"x86" @@ -1073,20 +1058,12 @@ msgstr "このイメージを使用するには、USB メモリに直接展開 #. Tag: screen #: install-methods.xml:725 #, no-c-format -#| msgid "# zcat boot.img.gz > /dev/<replaceable>sda</replaceable>" msgid "# zcat boot.img.gz > /dev/<replaceable>sdX</replaceable>" msgstr "# zcat boot.img.gz > /dev/<replaceable>sdX</replaceable>" #. Tag: para #: install-methods.xml:727 #, no-c-format -#| msgid "" -#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> " -#| "which contains all the installer files (including the kernel) as well as " -#| "<command>yaboot</command> and its configuration file. Create a partition " -#| "of type \"Apple_Bootstrap\" on your USB stick using <command>mac-fdisk</" -#| "command>'s <userinput>C</userinput> command and extract the image " -#| "directly to that:" msgid "" "Create a partition of type \"Apple_Bootstrap\" on your USB stick using " "<command>mac-fdisk</command>'s <userinput>C</userinput> command and extract " @@ -1099,21 +1076,12 @@ msgstr "" #. Tag: screen #: install-methods.xml:733 #, no-c-format -#| msgid "# zcat boot.img.gz > /dev/<replaceable>sda2</replaceable>" msgid "# zcat boot.img.gz > /dev/<replaceable>sdX2</replaceable>" msgstr "# zcat boot.img.gz > /dev/<replaceable>sdX2</replaceable>" #. Tag: para #: install-methods.xml:735 #, no-c-format -#| msgid "" -#| "After that, mount the USB memory stick (<userinput>mount <replaceable " -#| "arch=\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/" -#| "sda2</replaceable> /mnt</userinput>), which will now have <phrase arch=" -#| "\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS " -#| "filesystem</phrase> on it, and copy a Debian netinst or businesscard ISO " -#| "image to it (see <xref linkend=\"usb-add-iso\"/>). Unmount the stick " -#| "(<userinput>umount /mnt</userinput>) and you are done." msgid "" "After that, mount the USB memory stick <phrase arch=\"x86\">" "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</" @@ -1141,9 +1109,6 @@ msgstr "ファイルのコピー — 柔軟な方法" #. Tag: para #: install-methods.xml:753 #, no-c-format -#| msgid "" -#| "If you like more flexibility or just want to know what's going on, you " -#| "should use the following method to put the files on your stick." msgid "" "If you like more flexibility or just want to know what's going on, you " "should use the following method to put the files on your stick. One " @@ -1159,7 +1124,6 @@ msgstr "" #. Tag: title #: install-methods.xml:768 install-methods.xml:865 #, no-c-format -#| msgid "Booting the USB stick" msgid "Partitioning the USB stick" msgstr "USB メモリのパーティション分割" @@ -1176,16 +1140,6 @@ msgstr "" #. Tag: para #: install-methods.xml:774 #, no-c-format -#| msgid "" -#| "Since most USB sticks come pre-configured with a single FAT16 partition, " -#| "you probably won't have to repartition or reformat the stick. If you have " -#| "to do that anyway, use <command>cfdisk</command> or any other " -#| "partitioning tool to create a FAT16 partition, and then create the " -#| "filesystem using: <informalexample><screen>\n" -#| "# mkdosfs /dev/<replaceable>sda1</replaceable>\n" -#| "</screen></informalexample> Take care that you use the correct device " -#| "name for your USB stick. The <command>mkdosfs</command> command is " -#| "contained in the <classname>dosfstools</classname> Debian package." msgid "" "Since most USB sticks come pre-configured with a single FAT16 partition, you " "probably won't have to repartition or reformat the stick. If you have to do " @@ -1210,14 +1164,6 @@ msgstr "" #. Tag: para #: install-methods.xml:788 #, no-c-format -#| msgid "" -#| "In order to start the kernel after booting from the USB stick, we will " -#| "put a boot loader on the stick. Although any boot loader (e.g. " -#| "<command>LILO</command>) should work, it's convenient to use " -#| "<command>SYSLINUX</command>, since it uses a FAT16 partition and can be " -#| "reconfigured by just editing a text file. Any operating system which " -#| "supports the FAT file system can be used to make changes to the " -#| "configuration of the boot loader." msgid "" "In order to start the kernel after booting from the USB stick, we will put a " "boot loader on the stick. Although any boot loader (e.g. <classname>lilo</" @@ -1236,16 +1182,6 @@ msgstr "" #. Tag: para #: install-methods.xml:798 #, no-c-format -#| msgid "" -#| "To put <command>SYSLINUX</command> on the FAT16 partition on your USB " -#| "stick, install the <classname>syslinux</classname> and <classname>mtools</" -#| "classname> packages on your system, and do: <informalexample><screen>\n" -#| "# syslinux /dev/<replaceable>sda1</replaceable>\n" -#| "</screen></informalexample> Again, take care that you use the correct " -#| "device name. The partition must not be mounted when starting " -#| "<command>SYSLINUX</command>. This procedure writes a boot sector to the " -#| "partition and creates the file <filename>ldlinux.sys</filename> which " -#| "contains the boot loader code." msgid "" "To put <classname>syslinux</classname> on the FAT16 partition on your USB " "stick, install the <classname>syslinux</classname> and <classname>mtools</" @@ -1271,23 +1207,12 @@ msgstr "" #. Tag: title #: install-methods.xml:815 install-methods.xml:912 #, no-c-format -#| msgid "Adding an ISO image" msgid "Adding the installer image" msgstr "インストーライメージの追加" #. Tag: para #: install-methods.xml:816 #, no-c-format -#| msgid "" -#| "Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and " -#| "copy the following files from the Debian archives to the stick: " -#| "<itemizedlist> <listitem><para> <filename>vmlinuz</filename> (kernel " -#| "binary) </para></listitem> <listitem><para> <filename>initrd.gz</" -#| "filename> (initial ramdisk image) </para></listitem> <listitem><para> " -#| "<filename>syslinux.cfg</filename> (SYSLINUX configuration file) </para></" -#| "listitem> <listitem><para> Optional kernel modules </para></listitem> </" -#| "itemizedlist> If you want to rename the files, please note that " -#| "<command>SYSLINUX</command> can only process DOS (8.3) file names." msgid "" "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /" "mnt</userinput>) and copy the following installer image files to the stick: " @@ -1345,18 +1270,6 @@ msgstr "" #. Tag: para #: install-methods.xml:866 #, no-c-format -#| msgid "" -#| "Most USB sticks do not come pre-configured in such a way that Open " -#| "Firmware can boot from them, so you will need to repartition the stick. " -#| "On Mac systems, run <userinput>mac-fdisk /dev/sda</userinput>, initialise " -#| "a new partition map using the <userinput>i</userinput> command, and " -#| "create a new partition of type Apple_Bootstrap using the <userinput>C</" -#| "userinput> command. (Note that the first \"partition\" will always be the " -#| "partition map itself.) Then type <informalexample><screen>\n" -#| "$ hformat /dev/<replaceable>sda2</replaceable>\n" -#| "</screen></informalexample> Take care that you use the correct device " -#| "name for your USB stick. The <command>hformat</command> command is " -#| "contained in the <classname>hfsutils</classname> Debian package." msgid "" "Most USB sticks do not come pre-configured in such a way that Open Firmware " "can boot from them, so you will need to repartition the stick. On Mac " @@ -1402,22 +1315,6 @@ msgstr "" #. Tag: para #: install-methods.xml:892 #, no-c-format -#| msgid "" -#| "The normal <command>ybin</command> tool that comes with <command>yaboot</" -#| "command> does not yet understand USB storage devices, so you will have to " -#| "install <command>yaboot</command> by hand using the <classname>hfsutils</" -#| "classname> tools. Type <informalexample><screen>\n" -#| "$ hmount /dev/sda2\n" -#| "$ hcopy -r /usr/lib/yaboot/yaboot :\n" -#| "$ hattrib -c UNIX -t tbxi :yaboot\n" -#| "$ hattrib -b :\n" -#| "$ humount\n" -#| "</screen></informalexample> Again, take care that you use the correct " -#| "device name. The partition must not be otherwise mounted during this " -#| "procedure. This procedure writes the boot loader to the partition, and " -#| "uses the HFS utilities to mark it in such a way that Open Firmware will " -#| "boot it. Having done this, the rest of the USB stick may be prepared " -#| "using the normal Unix utilities." msgid "" "The normal <command>ybin</command> tool that comes with <command>yaboot</" "command> does not yet understand USB storage devices, so you will have to " @@ -1453,9 +1350,6 @@ msgstr "" #. Tag: para #: install-methods.xml:913 #, no-c-format -#| msgid "" -#| "Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and " -#| "copy the following files from the Debian archives to the stick:" msgid "" "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /" "mnt</userinput>) and copy the following installer image files to the stick:" @@ -1545,7 +1439,6 @@ msgstr "" #. Tag: screen #: install-methods.xml:975 #, no-c-format -#| msgid "# install-mbr /dev/<replaceable>sda</replaceable>" msgid "# install-mbr /dev/<replaceable>sdX</replaceable>" msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>" diff --git a/po/ja/preseed.po b/po/ja/preseed.po index 5caf9c48d..672e0e4ac 100644 --- a/po/ja/preseed.po +++ b/po/ja/preseed.po @@ -1013,9 +1013,6 @@ msgstr "" #. Tag: para #: preseed.xml:574 #, no-c-format -#| msgid "" -#| "Put only a single space or tab between type and value: any additional " -#| "whitespace will be interpreted as belonging to the value." msgid "" "Put only a single space or tab between type and value: any additional " "whitespace will be interpreted as belonging to the value." @@ -1027,11 +1024,6 @@ msgstr "" #. Tag: para #: preseed.xml:578 #, no-c-format -#| msgid "" -#| "A line can be split into multiple lines by appending a backslash " -#| "(<quote><literal>\\</literal></quote>) as the line continuation " -#| "character. A good place to split a line is after the question name; a bad " -#| "place is between type and value." msgid "" "A line can be split into multiple lines by appending a backslash " "(<quote><literal>\\</literal></quote>) as the line continuation character. A " @@ -1223,10 +1215,6 @@ msgstr "" #. Tag: para #: preseed.xml:686 #, no-c-format -#| msgid "" -#| "The locale can be used to specify both language and country. To specify " -#| "the locale as a boot parameter, use <userinput>locale=<replaceable>en_US</" -#| "replaceable></userinput>." msgid "" "The locale can be used to specify both language and country and can be any " "combination of a language supported by &d-i; and a recognized country. If " @@ -1631,78 +1619,6 @@ msgstr "" #. Tag: screen #: preseed.xml:833 #, no-c-format -#| msgid "" -#| "# If the system has free space you can choose to only partition that " -#| "space.\n" -#| "# Note: this must be preseeded with a localized (translated) value.\n" -#| "#d-i partman-auto/init_automatically_partition \\\n" -#| "# select Guided - use the largest continuous free space\n" -#| "\n" -#| "# Alternatively, you can specify a disk to partition. The device name " -#| "must\n" -#| "# be given in traditional non-devfs format.\n" -#| "# For example, to use the first SCSI/SATA hard disk:\n" -#| "# Note: A disk must be specified, unless the system has only one disk.\n" -#| "#d-i partman-auto/disk string /dev/sda\n" -#| "# In addition, you'll need to specify the method to use.\n" -#| "# The presently available methods are: \"regular\", \"lvm\" and \"crypto" -#| "\"\n" -#| "d-i partman-auto/method string lvm\n" -#| "\n" -#| "# If one of the disks that are going to be automatically partitioned\n" -#| "# contains an old LVM configuration, the user will normally receive a\n" -#| "# warning. This can be preseeded away...\n" -#| "d-i partman-lvm/device_remove_lvm boolean true\n" -#| "# The same applies to pre-existing software RAID array:\n" -#| "d-i parman-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 from any of the predefined partitioning recipes.\n" -#| "# Note: this must be preseeded with a localized (translated) value.\n" -#| "d-i partman-auto/choose_recipe \\\n" -#| " select All files in one partition (recommended for new users)\n" -#| "#d-i partman-auto/choose_recipe \\\n" -#| "# select Separate /home partition\n" -#| "#d-i partman-auto/choose_recipe \\\n" -#| "# select Separate /home, /usr, /var, and /tmp partitions\n" -#| "\n" -#| "# Or provide a recipe of your own...\n" -#| "# The recipe format is documented in the file devel/partman-auto-recipe." -#| "txt.\n" -#| "# If you have a way to get a recipe file into the d-i environment, you " -#| "can\n" -#| "# just point at it.\n" -#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n" -#| "\n" -#| "# If not, you can put an entire recipe into the preconfiguration file in " -#| "one\n" -#| "# (logical) line. This example creates a small /boot partition, suitable\n" -#| "# swap, and uses the rest of the space for the root partition:\n" -#| "#d-i partman-auto/expert_recipe string \\\n" -#| "# boot-root :: \\\n" -#| "# 40 50 100 ext3 \\\n" -#| "# $primary{ } $bootable{ } \\\n" -#| "# method{ format } format{ } \\\n" -#| "# use_filesystem{ } filesystem{ ext3 } \\\n" -#| "# mountpoint{ /boot } \\\n" -#| "# . \\\n" -#| "# 500 10000 1000000000 ext3 \\\n" -#| "# method{ format } format{ } \\\n" -#| "# use_filesystem{ } filesystem{ ext3 } \\\n" -#| "# mountpoint{ / } \\\n" -#| "# . \\\n" -#| "# 64 512 300% linux-swap \\\n" -#| "# method{ swap } format{ } \\\n" -#| "# .\n" -#| "\n" -#| "# This makes partman automatically partition without confirmation, " -#| "provided\n" -#| "# that you told it what to do using one of the methods above.\n" -#| "d-i partman/confirm_write_new_label boolean true\n" -#| "d-i partman/choose_partition \\\n" -#| " select Finish partitioning and write changes to disk\n" -#| "d-i partman/confirm boolean true" msgid "" "# If the system has free space you can choose to only partition that space.\n" "#d-i partman-auto/init_automatically_partition select biggest_free\n" @@ -1851,12 +1767,6 @@ msgstr "" #. Tag: para #: preseed.xml:849 #, no-c-format -#| msgid "" -#| "This type of automated partitioning is easy to get wrong. It is also a " -#| "very new component that may still have some bugs or missing error " -#| "handling. The responsibility to get the various recipes right (so they " -#| "make sense and don't conflict) lies with the user. Check <filename>/var/" -#| "log/syslog</filename> if you run into problems." msgid "" "This type of automated partitioning is easy to get wrong. It is also " "functionality that receives relatively little testing from the developers of " @@ -1873,57 +1783,6 @@ msgstr "" #. Tag: screen #: preseed.xml:859 #, no-c-format -#| msgid "" -#| "# NOTE: this option is of beta release quality and should be used " -#| "carefully\n" -#| "\n" -#| "# The method should be set to \"raid\".\n" -#| "#d-i partman-auto/method string raid\n" -#| "# Specify the disks to be partitioned. They will all get the same " -#| "layout,\n" -#| "# so this will only work if the disks are the same size.\n" -#| "#d-i partman-auto/disk string /dev/discs/disc0/disc /dev/discs/disc1/" -#| "disc\n" -#| "\n" -#| "# Next you need to specify the physical partitions that will be used. \n" -#| "#d-i partman-auto/expert_recipe string \\\n" -#| "# multiraid :: \\\n" -#| "# 1000 5000 4000 raid \\\n" -#| "# $primary{ } method{ raid } \\\n" -#| "# . \\\n" -#| "# 64 512 300% raid \\\n" -#| "# method{ raid } \\\n" -#| "# . \\\n" -#| "# 500 10000 1000000000 raid \\\n" -#| "# method{ raid } \\\n" -#| "# .\n" -#| "\n" -#| "# Last you need to specify how the previously defined partitions will be\n" -#| "# used in the RAID setup. Remember to use the correct partition numbers\n" -#| "# for logical partitions.\n" -#| "# Parameters are:\n" -#| "# <raidtype> <devcount> <sparecount> <fstype> <" -#| "mountpoint> \\\n" -#| "# <devices> <sparedevices>\n" -#| "# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated " -#| "using \"#\"\n" -#| "#d-i partman-auto-raid/recipe string \\\n" -#| "# 1 2 0 ext3 / \\\n" -#| "# /dev/discs/disc0/part1#/dev/discs/disc1/part1 \\\n" -#| "# . \\\n" -#| "# 1 2 0 swap - \\\n" -#| "# /dev/discs/disc0/part5#/dev/discs/disc1/part5 \\\n" -#| "# . \\\n" -#| "# 0 2 0 ext3 /home \\\n" -#| "# /dev/discs/disc0/part6#/dev/discs/disc1/part6 \\\n" -#| "# .\n" -#| "\n" -#| "# This makes partman automatically partition without confirmation.\n" -#| "d-i partman-md/confirm boolean true\n" -#| "d-i partman/confirm_write_new_label boolean true\n" -#| "d-i partman/choose_partition \\\n" -#| " select Finish partitioning and write changes to disk\n" -#| "d-i partman/confirm boolean true" msgid "" "# NOTE: this option is of beta release quality and should be used carefully\n" "\n" diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po index b5dbc4be6..5545e5e63 100644 --- a/po/ja/using-d-i.po +++ b/po/ja/using-d-i.po @@ -1856,14 +1856,6 @@ msgstr "マルチディスクデバイス (ソフトウェア RAID) の設定" #. Tag: para #: using-d-i.xml:1165 #, no-c-format -#| msgid "" -#| "If you have more than one harddrive<footnote><para> To be honest, you can " -#| "construct MD device even from partitions residing on single physical " -#| "drive, but that won't bring you anything useful. </para></footnote> in " -#| "your computer, you can use <command>mdcfg</command> to set up your drives " -#| "for increased performance and/or better reliability of your data. The " -#| "result is called <firstterm>Multidisk Device</firstterm> (or after its " -#| "most famous variant <firstterm>software RAID</firstterm>)." msgid "" "If you have more than one harddrive<footnote><para> To be honest, you can " "construct an MD device even from partitions residing on single physical " @@ -2229,14 +2221,6 @@ msgstr "" #. Tag: para #: using-d-i.xml:1414 #, no-c-format -#| msgid "" -#| "RAID1 is a bit more tricky. First, you will be asked to enter the number " -#| "of active devices and the number of spare devices which will form the MD. " -#| "Next, you need to select from the list of available RAID partitions those " -#| "that will be active and then those that will be spare. The count of " -#| "selected partitions must be equal to the number provided few seconds ago. " -#| "Don't worry. If you make a mistake and select a different number of " -#| "partitions, the &d-i; won't let you continue until you correct the issue." msgid "" "RAID1 is a bit more tricky. First, you will be asked to enter the number of " "active devices and the number of spare devices which will form the MD. Next, " @@ -2989,14 +2973,6 @@ msgstr "" #. Tag: para #: using-d-i.xml:1901 #, no-c-format -#| msgid "" -#| "One thing to note here are the identifiers in parentheses " -#| "(<replaceable>sda2_crypt</replaceable> and <replaceable>loop0</" -#| "replaceable> in this case) and the mount points you assigned to each " -#| "encrypted volume. You will need this information later when booting the " -#| "new system. The differences between ordinary boot process and boot " -#| "process with encryption involved will be covered later in <xref linkend=" -#| "\"mount-encrypted-volumes\"/>." msgid "" "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</" "replaceable> and <replaceable>loop0</replaceable> in this case) and the " @@ -3688,10 +3664,6 @@ msgstr "" #. Tag: para #: using-d-i.xml:2343 #, no-c-format -#| msgid "" -#| "Once you've selected your tasks, select &BTN-CONT;. At this point, " -#| "<command>aptitude</command> will install the packages that are part of " -#| "the tasks you've selected." msgid "" "Once you've selected your tasks, select &BTN-CONT;. At this point, " "<command>aptitude</command> will install the packages that are part of the " diff --git a/po/ja/welcome.po b/po/ja/welcome.po index 8d38ecc06..0f5dde79c 100644 --- a/po/ja/welcome.po +++ b/po/ja/welcome.po @@ -784,16 +784,6 @@ msgstr "著作権およびソフトウェアライセンスについて" #. Tag: para #: welcome.xml:513 #, no-c-format -#| msgid "" -#| "We're sure that you've read some of the licenses that come with most " -#| "commercial software — they usually say that you can only use one " -#| "copy of the software on a single computer. This system's license isn't " -#| "like that at all. We encourage you to put a copy of on every computer in " -#| "your school or place of business. Lend your installation media to your " -#| "friends and help them install it on their computers! You can even make " -#| "thousands of copies and <emphasis>sell</emphasis> them — albeit " -#| "with a few restrictions. Your freedom to install and use the system comes " -#| "directly from Debian being based on <emphasis>free software</emphasis>." msgid "" "We're sure that you've read some of the licenses that come with most " "commercial software — they usually say that you can only use one copy " diff --git a/po/ru/preparing.po b/po/ru/preparing.po index afccd1407..28e3cf3c0 100644 --- a/po/ru/preparing.po +++ b/po/ru/preparing.po @@ -14,7 +14,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Tag: title #: preparing.xml:5 @@ -122,7 +123,6 @@ msgstr "" #. Tag: para #: preparing.xml:68 #, no-c-format -#| msgid "Create partition-able space for Debian on your hard disk." msgid "Create partitionable space for Debian on your hard disk." msgstr "Выделить место под Debian на жёстком диске." @@ -404,7 +404,8 @@ msgstr "Руководство по установке" #: preparing.xml:251 #, no-c-format msgid "This document you are now reading, in plain ASCII, HTML or PDF format." -msgstr "Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF." +msgstr "" +"Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF." #. Tag: itemizedlist #: preparing.xml:257 @@ -446,7 +447,8 @@ msgstr "Техническая документация" #. Tag: para #: preparing.xml:285 #, no-c-format -msgid "Often contains useful information on configuring or using your hardware." +msgid "" +"Often contains useful information on configuring or using your hardware." msgstr "" "Часто содержит полезную информацию по настройке и использованию вашего " "аппаратного обеспечения." @@ -565,7 +567,8 @@ msgstr "Информацию по аппаратному обеспечению #: preparing.xml:398 #, no-c-format msgid "The manuals that come with each piece of hardware." -msgstr "В руководствах, которые были вместе с приобретённым аппаратным обеспечением." +msgstr "" +"В руководствах, которые были вместе с приобретённым аппаратным обеспечением." #. Tag: para #: preparing.xml:403 @@ -979,7 +982,8 @@ msgstr "" msgid "" "The system on your network that you should use as a DNS (Domain Name " "Service) server." -msgstr "Система в сети, которая используется как DNS (Domain Name Service) сервер." +msgstr "" +"Система в сети, которая используется как DNS (Domain Name Service) сервер." #. Tag: para #: preparing.xml:631 @@ -1045,7 +1049,8 @@ msgstr "" #. Tag: para #: preparing.xml:678 #, no-c-format -msgid "A Pentium 4, 1GHz system is the minimum recommended for a desktop system." +msgid "" +"A Pentium 4, 1GHz system is the minimum recommended for a desktop system." msgstr "" "Минимальной рекомендуемой конфигурацией для настольной системыявляется " "машина с процессором Pentium 4, 1 ГГц." @@ -1398,15 +1403,6 @@ msgstr "" #. Tag: para #: preparing.xml:878 #, no-c-format -#| msgid "" -#| "If none of the above apply, you'll need to partition your hard disk " -#| "before starting the installation to create partition-able space for " -#| "Debian. If some of the partitions will be owned by other operating " -#| "systems, you should create those partitions using native operating system " -#| "partitioning programs. We recommend that you do <emphasis>not</emphasis> " -#| "attempt to create partitions for &debian; using another operating " -#| "system's tools. Instead, you should just create the native operating " -#| "system's partitions you will want to retain." msgid "" "If none of the above apply, you'll need to partition your hard disk before " "starting the installation to create partitionable space for Debian. If some " @@ -1530,7 +1526,8 @@ msgstr "" #: preparing.xml:955 #, no-c-format msgid "Boot the Debian installer to continue installing Debian." -msgstr "Загрузить программу установки Debian, чтобы продолжить установку Debian." +msgstr "" +"Загрузить программу установки Debian, чтобы продолжить установку Debian." #. Tag: title #: preparing.xml:969 @@ -2265,7 +2262,8 @@ msgstr "" #: preparing.xml:1395 #, no-c-format msgid "Pre-Installation Hardware and Operating System Setup" -msgstr "Настройка аппаратного обеспечения и операционной системы перед установкой" +msgstr "" +"Настройка аппаратного обеспечения и операционной системы перед установкой" #. Tag: para #: preparing.xml:1396 @@ -2296,13 +2294,6 @@ msgstr "Вызов меню настройки BIOS" #. Tag: para #: preparing.xml:1420 #, no-c-format -#| msgid "" -#| "BIOS provides the basic functions needed to boot your machine to allow " -#| "your operating system to access your hardware. Your system probably " -#| "provides a BIOS set-up menu, which is used to configure the BIOS. Before " -#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is setup " -#| "correctly; not doing so can lead to intermittent crashes or an inability " -#| "to install Debian." msgid "" "BIOS provides the basic functions needed to boot your machine to allow your " "operating system to access your hardware. Your system probably provides a " @@ -2310,12 +2301,11 @@ msgid "" "<emphasis>must</emphasis> ensure that your BIOS is set up correctly; not " "doing so can lead to intermittent crashes or an inability to install Debian." msgstr "" -"BIOS предоставляет основные функции для загрузки машины, " -"предоставляя операционной системе доступ к оборудованию. Обычно, " -"для настройки BIOS в машину встраивается меню. Перед " -"установкой вы <emphasis>должны</emphasis> убедиться, что ваш BIOS корректно " -"настроен; невыполнение этого может вызвать случайные сбои или невозможность " -"установки Debian." +"BIOS предоставляет основные функции для загрузки машины, предоставляя " +"операционной системе доступ к оборудованию. Обычно, для настройки BIOS в " +"машину встраивается меню. Перед установкой вы <emphasis>должны</emphasis> " +"убедиться, что ваш BIOS корректно настроен; невыполнение этого может вызвать " +"случайные сбои или невозможность установки Debian." #. Tag: para #: preparing.xml:1429 @@ -2445,15 +2435,6 @@ msgstr "Выбор загрузочного устройства" #. Tag: para #: preparing.xml:1520 #, no-c-format -#| msgid "" -#| "Many BIOS set-up menus allow you to select the devices that will be used " -#| "to bootstrap the system. Set this to look for a bootable operating system " -#| "on <filename>A:</filename> (the first floppy disk), then optionally the " -#| "first CD-ROM device (possibly appearing as <filename>D:</filename> or " -#| "<filename>E:</filename>), and then from <filename>C:</filename> (the " -#| "first hard disk). This setting enables you to boot from either a floppy " -#| "disk or a CD-ROM, which are the two most common boot devices used to " -#| "install Debian." msgid "" "Many BIOS setup menus allow you to select the devices that will be used to " "bootstrap the system. Set this to look for a bootable operating system on " @@ -2581,7 +2562,8 @@ msgstr "Изменение порядка загрузки на компьюте #. Tag: para #: preparing.xml:1603 #, no-c-format -msgid "As your computer starts, press the keys to enter the SCSI setup utility." +msgid "" +"As your computer starts, press the keys to enter the SCSI setup utility." msgstr "" "Как только компьютер начнёт загружаться, нажмите клавиши для входа в меню " "настройки SCSI." @@ -2617,7 +2599,8 @@ msgstr "Найдите пункт изменения порядка загруз #. Tag: para #: preparing.xml:1627 #, no-c-format -msgid "Set the utility so that the SCSI ID of the CD drive is first on the list." +msgid "" +"Set the utility so that the SCSI ID of the CD drive is first on the list." msgstr "Настройте так, что SCSI ID привода компакт дисков был первым в списке." #. Tag: para @@ -3317,4 +3300,3 @@ msgstr "" "программы установки вместо отображения пользовательского интерфейса, " "попробуйте изменить настройки экрана в MacOS на использование 256 цветов " "вместо <quote>тысяч</quote> или <quote>миллионов</quote>." - |