summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2015-04-17 13:09:16 +0000
committerSamuel Thibault <sthibault@debian.org>2015-04-17 13:09:16 +0000
commitacbaf3682ffa753126ca8c6abee6676780429f6f (patch)
tree17eb466dd09bd6f717d0dfb09584037ee7cc25ea
parent3bf81541735d366eac3432e3b26aea1e72e4a0d8 (diff)
downloadinstallation-guide-acbaf3682ffa753126ca8c6abee6676780429f6f.zip
unfuzzy more
-rw-r--r--po/fr/using-d-i.po59
-rw-r--r--po/pt/using-d-i.po14
-rw-r--r--po/zh_CN/using-d-i.po21
3 files changed, 4 insertions, 90 deletions
diff --git a/po/fr/using-d-i.po b/po/fr/using-d-i.po
index 8a0ca889a..c53706f78 100644
--- a/po/fr/using-d-i.po
+++ b/po/fr/using-d-i.po
@@ -1735,15 +1735,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1083
#, no-c-format
-#| msgid ""
-#| "If a hard disk has previously used under Solaris, the partitioner may not "
-#| "detect the size of the drive correctly. Creating a new partition table "
-#| "does not fix this issue. What does help, is to <quote>zero</quote> the "
-#| "first few sectors of the drive: <informalexample><screen>\n"
-#| "# dd if=/dev/zero of=/dev/hd<replaceable>X</replaceable> bs=512 count=2; "
-#| "sync\n"
-#| "</screen></informalexample> Note that this will make any existing data on "
-#| "that disk inaccessible."
msgid ""
"If a hard disk has previously used under Solaris, the partitioner may not "
"detect the size of the drive correctly. Creating a new partition table does "
@@ -2324,11 +2315,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1367
#, no-c-format
-#| msgid ""
-#| "If you choose guided partitioning for your IA-64 system, there will be an "
-#| "additional partition, formatted as a FAT16 bootable filesystem, for the "
-#| "EFI boot loader. There is also an additional menu item in the formatting "
-#| "menu to manually set up a partition as an EFI boot partition."
msgid ""
"If you have booted in EFI mode then within the guided partitioning setup "
"there will be an additional partition, formatted as a FAT32 bootable "
@@ -2356,29 +2342,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1381
#, no-c-format
-#| msgid ""
-#| "The list of partitions might look like this: <informalexample><screen>\n"
-#| " IDE1 master (hda) - 6.4 GB WDC AC36400L\n"
-#| " #1 primary 16.4 MB B f ext2 /boot\n"
-#| " #2 primary 551.0 MB swap swap\n"
-#| " #3 primary 5.8 GB ntfs\n"
-#| " pri/log 8.2 MB FREE SPACE\n"
-#| "\n"
-#| " IDE1 slave (hdb) - 80.0 GB ST380021A\n"
-#| " #1 primary 15.9 MB ext3\n"
-#| " #2 primary 996.0 MB fat16\n"
-#| " #3 primary 3.9 GB xfs /home\n"
-#| " #5 logical 6.0 GB f ext3 /\n"
-#| " #6 logical 1.0 GB f ext3 /var\n"
-#| " #7 logical 498.8 MB ext3\n"
-#| " #8 logical 551.5 MB swap swap\n"
-#| " #9 logical 65.8 GB ext2\n"
-#| "</screen></informalexample> This example shows two IDE harddrives divided "
-#| "into several partitions; the first disk has some free space. Each "
-#| "partition line consists of the partition number, its type, size, optional "
-#| "flags, file system, and mountpoint (if any). Note: this particular setup "
-#| "cannot be created using guided partitioning but it does show possible "
-#| "variation that can be achieved using manual partitioning."
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
" SCSI1 (0,0,0) (sda) - 6.4 GB WDC AC36400L\n"
@@ -2563,10 +2526,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1465
#, no-c-format
-#| msgid ""
-#| "If you forget to select and format an EFI boot partition, "
-#| "<command>partman</command> will detect this and will not let you continue "
-#| "until you allocate one."
msgid ""
"If you boot in EFI mode but forget to select and format an EFI System "
"Partition, <command>partman</command> will detect this and will not let you "
@@ -4204,14 +4163,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2476
#, no-c-format
-#| msgid ""
-#| "Another option when choosing to specify the mirror manually is to use "
-#| "<quote>http.debian.net</quote> as your mirror. <quote>http.debian.net</"
-#| "quote> is not a physical mirror but a mirror redirection service, i.e. it "
-#| "automatically refers your system to a real mirror near you in terms of "
-#| "network topology. It takes into account by which protocol you connect to "
-#| "it, i.e. if you use IPv6, it will refer you to an IPv6-capable mirror "
-#| "near you."
msgid ""
"Another option when choosing to specify the mirror manually is to use "
"<quote>httpredir.debian.org</quote> as your mirror. <quote>httpredir.debian."
@@ -4672,11 +4623,6 @@ msgstr "Autre choix"
#. Tag: para
#: using-d-i.xml:2762
#, no-c-format
-#| msgid ""
-#| "Useful for advanced users who want to install <command>LILO</command> "
-#| "somewhere else. In this case you will be asked for desired location. You "
-#| "can use traditional device names such as <filename>/dev/hda</filename> or "
-#| "<filename>/dev/sda</filename>."
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
"somewhere else. In this case you will be asked for desired location. You can "
@@ -5078,11 +5024,6 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:3038
#, no-c-format
-#| msgid ""
-#| "By default, grub will be installed into the Master Boot Record (MBR), "
-#| "where it will take over complete control of the boot process. If you "
-#| "prefer, you can install it elsewhere. See the grub manual for complete "
-#| "information."
msgid ""
"By default, Grub will be installed into the PReP partition, where it will "
"over complete control of the boot process."
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index ee27d66a9..2361cb4bc 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -5982,15 +5982,6 @@ msgstr ""
#~ "ser possível contornar desses problemas ao executar algumas configurações "
#~ "ou etapas da instalação manualmente a partir de uma shell."
-#~| msgid ""
-#~| "It is not possible to interactively select a different desktop during "
-#~| "the installation. However, it <emphasis>is</emphasis> possible to get &d-"
-#~| "i; to install a KDE desktop environment instead of GNOME by using "
-#~| "preseeding (see <xref linkend=\"preseed-pkgsel\"/>) or by adding the "
-#~| "parameter <literal>desktop=kde</literal> at the boot prompt when "
-#~| "starting the installer. Alternatively the more lightweight Xfce and LXDE "
-#~| "desktop environments can be selected by using <literal>desktop=xfce</"
-#~| "literal> or <literal>desktop=lxde</literal>."
#~ msgid ""
#~ "By default, &d-i; installs the Xfce desktop environment. It is not "
#~ "possible to interactively select a different desktop environment during "
@@ -6013,11 +6004,6 @@ msgstr ""
#~ "<literal>desktop=kde</literal>, <literal>desktop=lxde</literal> ou "
#~ "<literal>desktop=xfce</literal>."
-#~| msgid ""
-#~| "Some CD images (netinst and DVD) also allow selection of the desired "
-#~| "desktop environment from the graphical boot menu. Select the "
-#~| "<quote>Advanced options</quote> option in the main menu and look for "
-#~| "<quote>Alternative desktop environments</quote>."
#~ msgid ""
#~ "If you use the special GNOME-, KDE- or LXDE-variant of the first CD in "
#~ "the full CD set, the installer installs the respective desktop "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index d3c36cfef..07461fcc0 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3506,14 +3506,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2292
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are installing at default priority, the installer will largely "
-#| "take care of the configuration automatically, based on the installation "
-#| "method you are using and possibly using choices made earlier in the "
-#| "installation. In most cases the installer will automatically add a "
-#| "security mirror and, if you are installing the stable distribution, a "
-#| "mirror for the <quote>volatile</quote> update service."
+#, no-c-format
msgid ""
"If you are installing at default priority, the installer will largely take "
"care of the configuration automatically, based on the installation method "
@@ -3524,17 +3517,11 @@ msgid ""
msgstr ""
"如果您在默认优先级下进行安装,安装程序会自动处理大部分配置,它是根据您使用的"
"安装方法以及在安装开始时所做的选择。如果您安装的是稳定版,大多数情况下安装程"
-"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
+"序程序会自动加上安全镜像,它是 <quote>stable-updates</quote> 更新服务的镜像。"
#. Tag: para
#: using-d-i.xml:2301
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are installing at a lower priority (e.g. in expert mode), you will "
-#| "be able to make more decisions yourself. You can choose whether or not to "
-#| "use the security and/or volatile update services, and you can choose to "
-#| "add packages from the <quote>contrib</quote> and <quote>non-free</quote> "
-#| "sections of the archive."
+#, no-c-format
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
"able to make more decisions yourself. You can choose whether or not to use "
@@ -3543,7 +3530,7 @@ msgid ""
"sections of the archive."
msgstr ""
"如果您采用较低的优先级安装 (比如,expert 模式),就要自己做更多的判定。您可以"
-"选择是否使用安全、或者 volatile 更新服务,并能选择从 <quote>contrib</quote> "
+"选择是否使用安全、或者 stable-updates 更新服务,并能选择从 <quote>contrib</quote> "
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title