[SILENT_COMMIT] Update of POT and PO files for the manual

1 files changed, 134 insertions, 90 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index f427e8802..9a5dcd744 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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: 2009-11-08 01:11+0000\n"
+"POT-Creation-Date: 2009-11-18 01:11+0000\n"
 "PO-Revision-Date: 2009-08-01 14:15+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2769,7 +2769,7 @@ msgstr ""
 "<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
 
 #. Tag: term
-#: boot-installer.xml:2272 boot-installer.xml:2551
+#: boot-installer.xml:2272 boot-installer.xml:2568
 #, no-c-format
 msgid "netcfg/disable_dhcp"
 msgstr "netcfg/disable_dhcp"
@@ -3148,30 +3148,64 @@ msgstr ""
 
 #. Tag: term
 #: boot-installer.xml:2525
+#, fuzzy, no-c-format
+#| msgid "debian-installer/locale (locale)"
+msgid "debian-installer/language (language)"
+msgstr "debian-installer/locale (locale)"
+
+#. Tag: term
+#: boot-installer.xml:2526
+#, fuzzy, no-c-format
+#| msgid "debian-installer/theme (theme)"
+msgid "debian-installer/country (country)"
+msgstr "debian-installer/theme (theme)"
+
+#. Tag: term
+#: boot-installer.xml:2527
 #, no-c-format
 msgid "debian-installer/locale (locale)"
 msgstr "debian-installer/locale (locale)"
 
 #. Tag: para
-#: boot-installer.xml:2526
+#: boot-installer.xml:2528
+#, no-c-format
+msgid ""
+"There are two ways to specify the language, country and locale to use for "
+"the installation and the installed system."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2533
 #, no-c-format
 msgid ""
-"Can be used to set both the language and country for the installation. This "
-"will only work if the locale is supported in Debian. For example, use "
-"<userinput>locale=de_CH</userinput> to select German as language and "
-"Switzerland as country."
+"The first and easiest is to pass only the parameter <literal>locale</"
+"literal>. Language and country will then be derived from its value. You can "
+"for example use <userinput>locale=de_CH</userinput> to select German as "
+"language and Switzerland as country (<literal>de_CH.UTF-8</literal> will be "
+"set as default locale for the installed system). Limitation is that not all "
+"possible combinations of language, country and locale can be achieved this "
+"way."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2542
+#, no-c-format
+msgid ""
+"The second, more flexible option is to specify <literal>language</literal> "
+"and <literal>country</literal> separately. In this case <literal>locale</"
+"literal> can optionally be added to specify a specific default locale for "
+"the installed system. Example: <userinput>language=en country=DE "
+"locale=en_GB.UTF-8</userinput>."
 msgstr ""
-"可用来设置安装的语言和国家。它只在该 locale 被 Debian 支持时工作。例如，使用 "
-"<userinput>locale=de_CH</userinput> 选择德语作为语言，并且瑞士作为国家。"
 
 #. Tag: term
-#: boot-installer.xml:2537
+#: boot-installer.xml:2554
 #, no-c-format
 msgid "anna/choose_modules (modules)"
 msgstr "anna/choose_modules (modules)"
 
 #. Tag: para
-#: boot-installer.xml:2538
+#: boot-installer.xml:2555
 #, no-c-format
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
@@ -3186,7 +3220,7 @@ msgstr ""
 "classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
 
 #. Tag: para
-#: boot-installer.xml:2552
+#: boot-installer.xml:2569
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3195,13 +3229,13 @@ msgstr ""
 "如果您想禁止 DHCP 使用静态网络设置，将它设为 <userinput>true</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:2561
+#: boot-installer.xml:2578
 #, no-c-format
 msgid "mirror/protocol (protocol)"
 msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
-#: boot-installer.xml:2562
+#: boot-installer.xml:2579
 #, no-c-format
 msgid ""
 "By default the installer will use the http protocol to download files from "
@@ -3216,13 +3250,13 @@ msgstr ""
 "使用该协议。注意，您必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
 
 #. Tag: term
-#: boot-installer.xml:2575
+#: boot-installer.xml:2592
 #, no-c-format
 msgid "tasksel:tasksel/first (tasks)"
 msgstr "tasksel:tasksel/first (tasks)"
 
 #. Tag: para
-#: boot-installer.xml:2576
+#: boot-installer.xml:2593
 #, no-c-format
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
@@ -3233,13 +3267,13 @@ msgstr ""
 "literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
 
 #. Tag: title
-#: boot-installer.xml:2590
+#: boot-installer.xml:2607
 #, no-c-format
 msgid "Passing parameters to kernel modules"
 msgstr "给内核模块传递参数"
 
 #. Tag: para
-#: boot-installer.xml:2591
+#: boot-installer.xml:2608
 #, no-c-format
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3259,7 +3293,7 @@ msgstr ""
 "配置中。"
 
 #. Tag: para
-#: boot-installer.xml:2604
+#: boot-installer.xml:2621
 #, no-c-format
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3271,7 +3305,7 @@ msgstr ""
 "并很好地设置默认参数。然而，某些情况下还是需要手动设置参数。"
 
 #. Tag: para
-#: boot-installer.xml:2611
+#: boot-installer.xml:2628
 #, no-c-format
 msgid ""
 "The syntax to use to set parameters for modules is: "
@@ -3291,19 +3325,19 @@ msgstr ""
 "用："
 
 #. Tag: screen
-#: boot-installer.xml:2621
+#: boot-installer.xml:2638
 #, no-c-format
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr "3c509.xcvr=3 3c509.irq=10"
 
 #. Tag: title
-#: boot-installer.xml:2627
+#: boot-installer.xml:2644
 #, no-c-format
 msgid "Blacklisting kernel modules"
 msgstr "内核模块黑名单"
 
 #. Tag: para
-#: boot-installer.xml:2628
+#: boot-installer.xml:2645
 #, no-c-format
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3318,7 +3352,7 @@ msgstr ""
 "间冲突或者错误的驱动先加载，将造成设备无法正常工作。"
 
 #. Tag: para
-#: boot-installer.xml:2637
+#: boot-installer.xml:2654
 #, no-c-format
 msgid ""
 "You can blacklist a module using the following syntax: "
@@ -3332,7 +3366,7 @@ msgstr ""
 "入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
 
 #. Tag: para
-#: boot-installer.xml:2645
+#: boot-installer.xml:2662
 #, no-c-format
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
@@ -3344,19 +3378,19 @@ msgstr ""
 "件检查过程中从显示的模块列表中取消该模块。"
 
 #. Tag: title
-#: boot-installer.xml:2662
+#: boot-installer.xml:2679
 #, no-c-format
 msgid "Troubleshooting the Installation Process"
 msgstr "安装过程中的故障修复"
 
 #. Tag: title
-#: boot-installer.xml:2667
+#: boot-installer.xml:2684
 #, no-c-format
 msgid "CD-ROM Reliability"
 msgstr "CD-ROM 的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:2668
+#: boot-installer.xml:2685
 #, no-c-format
 msgid ""
 "Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3368,7 +3402,7 @@ msgstr ""
 "&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
 
 #. Tag: para
-#: boot-installer.xml:2675
+#: boot-installer.xml:2692
 #, no-c-format
 msgid ""
 "There are many different possible causes for these problems. We can only "
@@ -3379,13 +3413,13 @@ msgstr ""
 "下的由您来处理。"
 
 #. Tag: para
-#: boot-installer.xml:2681
+#: boot-installer.xml:2698
 #, no-c-format
 msgid "There are two very simple things that you should try first."
 msgstr "您首先应试试两种最简单的方法。"
 
 #. Tag: para
-#: boot-installer.xml:2686
+#: boot-installer.xml:2703
 #, no-c-format
 msgid ""
 "If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3393,7 +3427,7 @@ msgid ""
 msgstr "如果 CD-ROM 没有引导，检查一下它是否放好，并且没有弄脏。"
 
 #. Tag: para
-#: boot-installer.xml:2692
+#: boot-installer.xml:2709
 #, no-c-format
 msgid ""
 "If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3406,7 +3440,7 @@ msgstr ""
 "的问题可以用这种方法解决。"
 
 #. Tag: para
-#: boot-installer.xml:2702
+#: boot-installer.xml:2719
 #, no-c-format
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
@@ -3417,7 +3451,7 @@ msgstr ""
 "CD-ROM 和 DVD，为了方便，只提到 CD-ROM。"
 
 #. Tag: para
-#: boot-installer.xml:2708
+#: boot-installer.xml:2725
 #, no-c-format
 msgid ""
 "If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3425,13 +3459,13 @@ msgid ""
 msgstr "如果您用 CD-ROM 无法安装，试试其他可用的安装方法。"
 
 #. Tag: title
-#: boot-installer.xml:2716
+#: boot-installer.xml:2733
 #, no-c-format
 msgid "Common issues"
 msgstr "常见问题"
 
 #. Tag: para
-#: boot-installer.xml:2719
+#: boot-installer.xml:2736
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3439,7 +3473,7 @@ msgid ""
 msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
 
 #. Tag: para
-#: boot-installer.xml:2725
+#: boot-installer.xml:2742
 #, no-c-format
 msgid ""
 "If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -3450,7 +3484,7 @@ msgstr ""
 "准确一点，CD-ROM 驱动器所连接的控制器)。"
 
 #. Tag: para
-#: boot-installer.xml:2732
+#: boot-installer.xml:2749
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3460,19 +3494,19 @@ msgstr ""
 "常工作。"
 
 #. Tag: title
-#: boot-installer.xml:2743
+#: boot-installer.xml:2760
 #, no-c-format
 msgid "How to investigate and maybe solve issues"
 msgstr "如何调查研究或许可以解决问题"
 
 #. Tag: para
-#: boot-installer.xml:2744
+#: boot-installer.xml:2761
 #, no-c-format
 msgid "If the CD-ROM fails to boot, try the suggestions listed below."
 msgstr "如果从 CD-ROM 引导失败，试试下面所列的建议。"
 
 #. Tag: para
-#: boot-installer.xml:2749
+#: boot-installer.xml:2766
 #, no-c-format
 msgid ""
 "Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -3482,7 +3516,7 @@ msgstr ""
 "持您所使用的介质。"
 
 #. Tag: para
-#: boot-installer.xml:2755
+#: boot-installer.xml:2772
 #, no-c-format
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3506,7 +3540,7 @@ msgstr ""
 "用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
 
 #. Tag: screen
-#: boot-installer.xml:2768
+#: boot-installer.xml:2785
 #, no-c-format
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
@@ -3528,7 +3562,7 @@ msgstr ""
 "134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
 
 #. Tag: para
-#: boot-installer.xml:2773
+#: boot-installer.xml:2790
 #, no-c-format
 msgid ""
 "If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3545,7 +3579,7 @@ msgstr ""
 "Linux 知识。要执行命令，您应该首先切换到第二虚拟控制台(VT2)，并激活 shell。"
 
 #. Tag: para
-#: boot-installer.xml:2785
+#: boot-installer.xml:2802
 #, no-c-format
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3557,7 +3591,7 @@ msgstr ""
 "<command>dmesg</command> 的输出。"
 
 #. Tag: para
-#: boot-installer.xml:2792
+#: boot-installer.xml:2809
 #, no-c-format
 msgid ""
 "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3585,7 +3619,7 @@ msgstr ""
 "<command>modprobe</command> 手动加载。"
 
 #. Tag: para
-#: boot-installer.xml:2806
+#: boot-installer.xml:2823
 #, no-c-format
 msgid ""
 "Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3597,7 +3631,7 @@ msgstr ""
 "cdrom0</filename>。"
 
 #. Tag: para
-#: boot-installer.xml:2814
+#: boot-installer.xml:2831
 #, no-c-format
 msgid ""
 "Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3612,7 +3646,7 @@ msgstr ""
 "</screen></informalexample> 检查命令后面是否有什么错误信息。"
 
 #. Tag: para
-#: boot-installer.xml:2824
+#: boot-installer.xml:2841
 #, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3637,7 +3671,7 @@ msgstr ""
 "</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:2839
+#: boot-installer.xml:2856
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
@@ -3649,13 +3683,13 @@ msgstr ""
 "性。如果 CD-ROM 可以读，该选项可以对其进行测试。"
 
 #. Tag: title
-#: boot-installer.xml:2854
+#: boot-installer.xml:2871
 #, no-c-format
 msgid "Floppy Disk Reliability"
 msgstr "软盘的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:2856
+#: boot-installer.xml:2873
 #, no-c-format
 msgid ""
 "The biggest problem for people using floppy disks to install Debian seems to "
@@ -3664,7 +3698,7 @@ msgstr ""
 "对于用软盘安装 Debian 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
-#: boot-installer.xml:2861
+#: boot-installer.xml:2878
 #, no-c-format
 msgid ""
 "The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3680,7 +3714,7 @@ msgstr ""
 "息。"
 
 #. Tag: para
-#: boot-installer.xml:2870
+#: boot-installer.xml:2887
 #, no-c-format
 msgid ""
 "If you are having the installation stall at a particular floppy, the first "
@@ -3695,7 +3729,7 @@ msgstr ""
 "化以后看起来没有错误。如果可能，在别的统上重写这些软盘更好一些。"
 
 #. Tag: para
-#: boot-installer.xml:2879
+#: boot-installer.xml:2896
 #, no-c-format
 msgid ""
 "One user reports he had to write the images to floppy <emphasis>three</"
@@ -3706,7 +3740,7 @@ msgstr ""
 "软盘才算工作良好。"
 
 #. Tag: para
-#: boot-installer.xml:2885
+#: boot-installer.xml:2902
 #, no-c-format
 msgid ""
 "Normally you should not have to download a floppy image again, but if you "
@@ -3717,7 +3751,7 @@ msgstr ""
 "来检验下载的映像是否正确。"
 
 #. Tag: para
-#: boot-installer.xml:2891
+#: boot-installer.xml:2908
 #, no-c-format
 msgid ""
 "Other users have reported that simply rebooting a few times with the same "
@@ -3728,13 +3762,13 @@ msgstr ""
 "有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
 
 #. Tag: title
-#: boot-installer.xml:2900
+#: boot-installer.xml:2917
 #, no-c-format
 msgid "Boot Configuration"
 msgstr "引导配置"
 
 #. Tag: para
-#: boot-installer.xml:2902
+#: boot-installer.xml:2919
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3747,7 +3781,7 @@ msgstr ""
 "\"/> 讨论。"
 
 #. Tag: para
-#: boot-installer.xml:2909
+#: boot-installer.xml:2926
 #, no-c-format
 msgid ""
 "Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -3758,7 +3792,7 @@ msgstr ""
 "arch=\"x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</phrase>"
 
 #. Tag: para
-#: boot-installer.xml:2915
+#: boot-installer.xml:2932
 #, no-c-format
 msgid ""
 "If you have a large amount of memory installed in your machine, more than "
@@ -3771,13 +3805,13 @@ msgstr ""
 "<userinput>mem=512m</userinput>。"
 
 #. Tag: title
-#: boot-installer.xml:2926 boot-installer.xml:3028
+#: boot-installer.xml:2943 boot-installer.xml:3045
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr "&arch-title; 常见安装问题"
 
 #. Tag: para
-#: boot-installer.xml:2927
+#: boot-installer.xml:2944
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -3785,7 +3819,7 @@ msgid ""
 msgstr "有一些常见的安装问题，可以通过给安装程序特定的引导参数解决或避免。"
 
 #. Tag: para
-#: boot-installer.xml:2932
+#: boot-installer.xml:2949
 #, no-c-format
 msgid ""
 "Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -3796,7 +3830,7 @@ msgstr ""
 "息，并且知道软盘是好的，请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
 
 #. Tag: para
-#: boot-installer.xml:2938
+#: boot-installer.xml:2955
 #, no-c-format
 msgid ""
 "On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -3814,7 +3848,7 @@ msgstr ""
 "replaceable>,<replaceable>sectors</replaceable></userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:2947
+#: boot-installer.xml:2964
 #, no-c-format
 msgid ""
 "If you have a very old machine, and the kernel hangs after saying "
@@ -3827,7 +3861,7 @@ msgstr ""
 "userinput> 参数来取消这个测试。"
 
 #. Tag: para
-#: boot-installer.xml:2954
+#: boot-installer.xml:2971
 #, no-c-format
 msgid ""
 "Some systems (especially laptops) that have a native resolution that is not "
@@ -3850,7 +3884,7 @@ msgstr ""
 "boot 参数 <userinput>fb=false</userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:2972
+#: boot-installer.xml:2989
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3868,13 +3902,13 @@ msgstr ""
 "\"boot-parms\"/> 来获得细节信息。"
 
 #. Tag: title
-#: boot-installer.xml:2986
+#: boot-installer.xml:3003
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr "在 PCMCIA 配置阶段系统停止"
 
 #. Tag: para
-#: boot-installer.xml:2987
+#: boot-installer.xml:3004
 #, no-c-format
 msgid ""
 "Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -3892,7 +3926,7 @@ msgstr ""
 "段。"
 
 #. Tag: para
-#: boot-installer.xml:2997
+#: boot-installer.xml:3014
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3912,13 +3946,13 @@ msgstr ""
 "项。注意您在安装程序中，输入这些值的时候必须忽略逗号。"
 
 #. Tag: title
-#: boot-installer.xml:3014
+#: boot-installer.xml:3031
 #, no-c-format
 msgid "System Freeze while Loading USB Modules"
 msgstr "在装入 USB 模块时系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3015
+#: boot-installer.xml:3032
 #, no-c-format
 msgid ""
 "The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -3934,19 +3968,19 @@ msgstr ""
 "<userinput>nousb</userinput> 参数。"
 
 #. Tag: para
-#: boot-installer.xml:3029
+#: boot-installer.xml:3046
 #, no-c-format
 msgid "There are some common installation problems that are worth mentioning."
 msgstr "有一些常见的安装问题值得解释一下。"
 
 #. Tag: title
-#: boot-installer.xml:3035
+#: boot-installer.xml:3052
 #, no-c-format
 msgid "Misdirected video output"
 msgstr "错误的视频输出"
 
 #. Tag: para
-#: boot-installer.xml:3036
+#: boot-installer.xml:3053
 #, no-c-format
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -3970,7 +4004,7 @@ msgstr ""
 "<userinput>video=atyfb:off</userinput> 启动安装程序。"
 
 #. Tag: para
-#: boot-installer.xml:3050
+#: boot-installer.xml:3067
 #, no-c-format
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
@@ -3983,13 +4017,13 @@ msgstr ""
 "xorg.conf</filename> 中的视频驱动。"
 
 #. Tag: title
-#: boot-installer.xml:3061
+#: boot-installer.xml:3078
 #, no-c-format
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr "从 CD-ROM 上引导或安装失败"
 
 #. Tag: para
-#: boot-installer.xml:3062
+#: boot-installer.xml:3079
 #, no-c-format
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4000,19 +4034,19 @@ msgstr ""
 "费解的错误。SunBlade 系统被报告了很多问题。"
 
 #. Tag: para
-#: boot-installer.xml:3068
+#: boot-installer.xml:3085
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr "我们建议从网络安装这些系统。"
 
 #. Tag: title
-#: boot-installer.xml:3077
+#: boot-installer.xml:3094
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr "内核起始信息注解"
 
 #. Tag: para
-#: boot-installer.xml:3079
+#: boot-installer.xml:3096
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -4045,13 +4079,13 @@ msgstr ""
 ">)。"
 
 #. Tag: title
-#: boot-installer.xml:3104
+#: boot-installer.xml:3121
 #, no-c-format
 msgid "Reporting Installation Problems"
 msgstr "报告安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3105
+#: boot-installer.xml:3122
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -4068,7 +4102,7 @@ msgstr ""
 "索。如果您正在提交一个 bug 报告，可以报告里附上该信息。"
 
 #. Tag: para
-#: boot-installer.xml:3116
+#: boot-installer.xml:3133
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4079,13 +4113,13 @@ msgstr ""
 "新安装的系统启动后，放在 <filename>/var/log/debian-installer/</filename> 里。"
 
 #. Tag: title
-#: boot-installer.xml:3127
+#: boot-installer.xml:3144
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr "提交缺陷报告"
 
 #. Tag: para
-#: boot-installer.xml:3128
+#: boot-installer.xml:3145
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -4097,7 +4131,7 @@ msgstr ""
 "这让我们可以尽可能多地了解硬件的配置数量。"
 
 #. Tag: para
-#: boot-installer.xml:3135
+#: boot-installer.xml:3152
 #, no-c-format
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
@@ -4108,7 +4142,7 @@ msgstr ""
 "件列表。确保您使用的邮件地址可以被公开。"
 
 #. Tag: para
-#: boot-installer.xml:3141
+#: boot-installer.xml:3158
 #, no-c-format
 msgid ""
 "If you have a working Debian system, the easiest way to send an installation "
@@ -4126,7 +4160,7 @@ msgstr ""
 "command> 命令。"
 
 #. Tag: para
-#: boot-installer.xml:3151
+#: boot-installer.xml:3168
 #, no-c-format
 msgid ""
 "Alternatively you can use this template when filling out installation "
@@ -4212,6 +4246,16 @@ msgstr ""
 "</screen></informalexample> 在 bug 报告中，请说明问题所在，包括内核挂起时最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
 
+#~ msgid ""
+#~ "Can be used to set both the language and country for the installation. "
+#~ "This will only work if the locale is supported in Debian. For example, "
+#~ "use <userinput>locale=de_CH</userinput> to select German as language and "
+#~ "Switzerland as country."
+#~ msgstr ""
+#~ "可用来设置安装的语言和国家。它只在该 locale 被 Debian 支持时工作。例如，使"
+#~ "用 <userinput>locale=de_CH</userinput> 选择德语作为语言，并且瑞士作为国"
+#~ "家。"
+
 #~ msgid "Alpha Console Firmware"
 #~ msgstr "Alpha 控制台固件"