Regenerating po files:

- ./scripts/merge_xml en
- ./scripts/update_pot
- ./scripts/update_po da|el|es|fi|hu|ja|ko|nl|nn|pt|ro|ru|sv|tl|vi|zh_CN|zh_TW

1 files changed, 66 insertions, 83 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index cd6365d69..45cdfd0a4 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: 2012-09-18 17:24+0000\n"
+"POT-Creation-Date: 2012-07-20 14:12+0000\n"
 "PO-Revision-Date: 2012-07-25 23:07+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -905,13 +905,19 @@ msgstr "准备开始"
 
 #. Tag: para
 #: random-bits.xml:405
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "With your current *nix partitioning tools, repartition the hard drive as "
+#| "needed, creating at least one filesystem plus swap. You need around &base-"
+#| "system-size;MB of space available for a console only install, or about "
+#| "&task-desktop-lxde-inst;MB if you plan to install X (more if you intend "
+#| "to install desktop environments like GNOME or KDE)."
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
-"needed, creating at least one filesystem plus swap. You need around &base-"
-"system-size;MB of space available for a console only install, or about &task-"
-"desktop-lxde-inst;MB if you plan to install X (more if you intend to install "
-"desktop environments like GNOME or KDE)."
+"needed, creating at least one filesystem plus swap. You need around 350MB of "
+"space available for a console only install, or about 1GB if you plan to "
+"install X (more if you intend to install desktop environments like GNOME or "
+"KDE)."
 msgstr ""
 "如果需重新分区，用您当前的 *nix 的分区工具，至少要划分出一个文件系统，以及交"
 "换分区。如果只用控制台，至少要准备 &base-system-size;MB 空间，倘若想装 X，就"
@@ -1743,34 +1749,11 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:816
 #, no-c-format
-msgid "Remote access: Installing SSH and setting a password"
-msgstr ""
-
-#. Tag: para
-#: random-bits.xml:817
-#, no-c-format
-msgid ""
-"In case you can login to the system via console, you can skip this section. "
-"If the system should be accessible via the network later on, you need to "
-"install SSH and set a password for root:"
-msgstr ""
-
-#. Tag: screen
-#: random-bits.xml:823
-#, no-c-format
-msgid ""
-"# aptitude install ssh\n"
-"# passwd"
-msgstr ""
-
-#. Tag: title
-#: random-bits.xml:828
-#, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:829
+#: random-bits.xml:817
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1789,7 +1772,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:840
+#: random-bits.xml:828
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1800,19 +1783,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:846
+#: random-bits.xml:834
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:857
+#: random-bits.xml:845
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:859
+#: random-bits.xml:847
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1826,7 +1809,7 @@ msgstr ""
 "接到具有 &debian; 镜像的网络(比如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:867
+#: random-bits.xml:855
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1840,7 +1823,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:863
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1851,7 +1834,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:880
+#: random-bits.xml:868
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1863,13 +1846,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:890
+#: random-bits.xml:878
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:893
+#: random-bits.xml:881
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1877,13 +1860,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:899
+#: random-bits.xml:887
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:904
+#: random-bits.xml:892
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1892,7 +1875,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:910
+#: random-bits.xml:898
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1903,13 +1886,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:922
+#: random-bits.xml:910
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:923
+#: random-bits.xml:911
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1919,7 +1902,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:928
+#: random-bits.xml:916
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1961,13 +1944,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:934
+#: random-bits.xml:922
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:935
+#: random-bits.xml:923
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1991,13 +1974,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:954
+#: random-bits.xml:942
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:956
+#: random-bits.xml:944
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2007,13 +1990,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:964
+#: random-bits.xml:952
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:969
+#: random-bits.xml:957
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2026,7 +2009,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:978
+#: random-bits.xml:966
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2037,19 +2020,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:990
+#: random-bits.xml:978
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:993
+#: random-bits.xml:981
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:998
+#: random-bits.xml:986
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2057,7 +2040,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:1003
+#: random-bits.xml:991
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2067,7 +2050,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:1009
+#: random-bits.xml:997
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2077,13 +2060,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1028
+#: random-bits.xml:1016
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1030
+#: random-bits.xml:1018
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2097,7 +2080,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1038
+#: random-bits.xml:1026
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2108,7 +2091,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1043
+#: random-bits.xml:1031
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2121,7 +2104,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1050
+#: random-bits.xml:1038
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2129,7 +2112,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1058
+#: random-bits.xml:1046
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2144,7 +2127,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1073
+#: random-bits.xml:1061
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2162,7 +2145,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1092
+#: random-bits.xml:1080
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2170,7 +2153,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1098
+#: random-bits.xml:1086
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2181,7 +2164,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1104
+#: random-bits.xml:1092
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2195,7 +2178,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1113
+#: random-bits.xml:1101
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2203,7 +2186,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1119
+#: random-bits.xml:1107
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2220,13 +2203,13 @@ msgstr ""
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
 #. Tag: title
-#: random-bits.xml:1139
+#: random-bits.xml:1127
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1140
+#: random-bits.xml:1128
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2239,7 +2222,7 @@ msgstr ""
 "前端。"
 
 #. Tag: para
-#: random-bits.xml:1148
+#: random-bits.xml:1136
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2254,7 +2237,7 @@ msgstr ""
 "有一些优点，比如可以使用鼠标，以及在一个屏幕下显示多个问题。"
 
 #. Tag: para
-#: random-bits.xml:1157
+#: random-bits.xml:1145
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2274,7 +2257,7 @@ msgstr ""
 "<quote>Help</quote> 选项选取后看到。"
 
 #. Tag: para
-#: random-bits.xml:1168
+#: random-bits.xml:1156
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2290,7 +2273,7 @@ msgstr ""
 "mini.iso</filename>。</para> </footnote>，主要用于测试。"
 
 #. Tag: para
-#: random-bits.xml:1181
+#: random-bits.xml:1169
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2307,7 +2290,7 @@ msgstr ""
 "的 PowerPC 系统上，但其它的不行。"
 
 #. Tag: para
-#: random-bits.xml:1195
+#: random-bits.xml:1183
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2315,7 +2298,7 @@ msgid ""
 msgstr "如同一般安装程序，它也可以在启动图形安装界面时添加引导参数。"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1189
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2327,7 +2310,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1208
+#: random-bits.xml:1196
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2339,13 +2322,13 @@ msgstr ""
 "程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
 
 #. Tag: title
-#: random-bits.xml:1218
+#: random-bits.xml:1206
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1219
+#: random-bits.xml:1207
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2356,7 +2339,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1225
+#: random-bits.xml:1213
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2373,7 +2356,7 @@ msgstr ""
 "换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
-#: random-bits.xml:1235
+#: random-bits.xml:1223
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2384,7 +2367,7 @@ msgstr ""
 "帮助信息可以通过该按钮或者按下 <keycap>F1</keycap> 键。"
 
 #. Tag: para
-#: random-bits.xml:1241
+#: random-bits.xml:1229
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"