aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/installer/zh_CN.po201
-rw-r--r--docs/installer/zh_CN/DrakLive-cover.xml17
-rw-r--r--docs/installer/zh_CN/DrakLive.xml15
-rw-r--r--docs/installer/zh_CN/DrakX-cover.xml17
-rw-r--r--docs/installer/zh_CN/DrakX.xml15
-rw-r--r--docs/installer/zh_CN/exitInstall.xml13
-rw-r--r--docs/installer/zh_CN/formatPartitions.xml18
-rw-r--r--docs/installer/zh_CN/installUpdates.xml10
-rw-r--r--docs/installer/zh_CN/installer.xml146
-rw-r--r--docs/installer/zh_CN/login.xml15
-rw-r--r--docs/installer/zh_CN/media_selection.xml22
-rw-r--r--docs/installer/zh_CN/misc-params.xml26
-rw-r--r--docs/mcc-help/de.po44
-rw-r--r--docs/mcc-help/de/msecgui.xml13
-rw-r--r--docs/mcc-help/de/otherMageiaTools.xml2
-rw-r--r--docs/mcc-help/de/scannerdrake.xml26
-rw-r--r--docs/mcc-help/de/system-config-printer.xml41
17 files changed, 364 insertions, 277 deletions
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index fbbb3cc5..892a6a04 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2016-02-10 16:29+0200\n"
-"PO-Revision-Date: 2016-05-20 11:06+0000\n"
+"PO-Revision-Date: 2016-05-27 07:50+0000\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
"language/zh_CN/)\n"
@@ -1633,12 +1633,12 @@ msgstr "Mageia 5"
#. type: Content of: <book><info><cover><para>
#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
msgid "The Official Documentation for Mageia"
-msgstr ""
+msgstr "Mageia 的官方文档"
#. type: Content of: <book><info><cover><mediaobject>
#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1648,6 +1648,9 @@ msgid ""
"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
msgstr ""
+"此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link ns6:href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/"
+"licenses/by-sa/3.0/</link>）发布。"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
@@ -1657,6 +1660,8 @@ msgid ""
"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
"neodoc.biz\">NeoDoc</link>."
msgstr ""
+"此手册由 <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link> 开发的 <link "
+"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> 生成。"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
@@ -1666,6 +1671,8 @@ msgid ""
"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
"link>, if you would like to help improve this manual."
msgstr ""
+"内容由志愿者编写。若您希望完善此手册，请联系 <link ns6:href=\"https://wiki."
+"mageia.org/en/Documentation_team\">文档团队</link>。"
#. type: Content of: <article><info><cover><para><note>
#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
@@ -1721,6 +1728,9 @@ msgid ""
"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/exitInstall.xml:21
@@ -1728,7 +1738,7 @@ msgid ""
"You have finished installing and configuring <application>Mageia</"
"application> and it is now safe to remove the installation medium and reboot "
"your computer."
-msgstr ""
+msgstr "您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。"
#. type: Content of: <section><para>
#: en/exitInstall.xml:25
@@ -1736,30 +1746,32 @@ msgid ""
"After reboot, in the bootloader screen, you can choose between the operating "
"systems on your computer (if you have more than one)."
msgstr ""
+"重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系"
+"统）。"
#. type: Content of: <section><para>
#: en/exitInstall.xml:28
msgid ""
"If you didn't adjust the settings for the bootloader, your Mageia install "
"will be automatically selected and started."
-msgstr ""
+msgstr "若您没有调整引导器的配置，将会自动启动 Mageia。"
#. type: Content of: <section><para>
#: en/exitInstall.xml:31
msgid "Enjoy!"
-msgstr ""
+msgstr "Enjoy!"
#. type: Content of: <section><para>
#: en/exitInstall.xml:33
msgid ""
"Visit www.mageia.org if you have any questions or want to contribute to "
"Mageia"
-msgstr ""
+msgstr "若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。"
#. type: Content of: <section><info><title>
#: en/formatPartitions.xml:4
msgid "Formatting"
-msgstr ""
+msgstr "格式化"
#. Made by marja on 2012 03 29
#. NEEDS TO BE REVIEWED!
@@ -1775,6 +1787,12 @@ msgid ""
"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
"</imagedata> </imageobject>"
msgstr ""
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
+"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
+"</imagedata> </imageobject>"
#. type: Content of: <section><para>
#: en/formatPartitions.xml:30
@@ -1782,11 +1800,13 @@ msgid ""
"Here you can choose which partition(s) you wish to format. Any data on "
"partitions <emphasis>not</emphasis> marked for formatting will be saved."
msgstr ""
+"这里您可以选择要格式化的分区。<emphasis>未标记为格式化</emphasis>的分区上的数"
+"据将会被保留。"
#. type: Content of: <section><para>
#: en/formatPartitions.xml:34
msgid "Usually at least the partitions DrakX selected, need to be formatted"
-msgstr ""
+msgstr "一般情况下，DrakX 自动选择的分区需要被格式化。"
#. type: Content of: <section><para>
#: en/formatPartitions.xml:37
@@ -1794,6 +1814,8 @@ msgid ""
"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
"check for so called <emphasis>bad blocks</emphasis>"
msgstr ""
+"可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>"
+"的分区。"
#. type: Content of: <section><tip><para>
#: en/formatPartitions.xml:42
@@ -1803,18 +1825,20 @@ msgid ""
"and then on <guibutton>Custom</guibutton> to get back to the main screen. "
"In that screen you can choose to view what is in your partitions."
msgstr ""
+"若您不确定所做选择是否正确，可以点击两次 <guibutton>上一页</guibutton>回到主"
+"界面，然后查看相应分区中的数据。"
#. type: Content of: <section><para>
#: en/formatPartitions.xml:49
msgid ""
"When you are confident about the selection, click on <guibutton>Next</"
"guibutton> to continue."
-msgstr ""
+msgstr "若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。"
#. type: Content of: <section><info><title>
#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
-msgstr ""
+msgstr "DrakX，Mageia 的安装器"
#. type: Content of: <section><para>
#: en/installer.xml:20
@@ -1823,23 +1847,25 @@ msgid ""
"Installer is designed to help make your installation or upgrade as easy as "
"possible."
msgstr ""
+"无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升"
+"级系统。"
#. type: Content of: <section><para>
#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
-msgstr ""
+msgstr "初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。"
#. type: Content of: <section><figure><info><title>
#: en/installer.xml:34
msgid "Installation Welcome Screen"
-msgstr ""
+msgstr "安装欢迎屏幕"
#. type: Content of: <section><figure>
#: en/installer.xml:33
msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr ""
+msgstr "<placeholder type=\"info\" id=\"0\"/>"
#. type: Content of: <section><figure><para>
#: en/installer.xml:37
@@ -1847,6 +1873,8 @@ msgid ""
"Here are the default welcome screens when using a Mageia DVD, The first one "
"with a legacy system and the second one with an UEFI system:"
msgstr ""
+"此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二个"
+"是使用 UEFI 引导的系统。"
#. type: Content of: <section><figure><mediaobject>
#: en/installer.xml:42
@@ -1854,6 +1882,8 @@ msgid ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
@@ -1861,12 +1891,14 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/installer.xml:54
msgid ""
"From this first screen, it is possible to set some personal preferences:"
-msgstr ""
+msgstr "在此页中，可以进行自定义设置："
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:59
@@ -1874,6 +1906,7 @@ msgid ""
"The language (for the installation only, may be different that the chosen "
"language for the system) by pressing the key F2 (Legacy mode only)"
msgstr ""
+"按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:66
@@ -1881,11 +1914,13 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
"</imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:71
msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr ""
+msgstr "使用方向键来选择语言，然后按 Enter 键。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:74
@@ -1895,6 +1930,9 @@ msgid ""
"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
"Tool</guilabel>."
msgstr ""
+"此处给出了使用 Live DVD/CD 安装时法语版的欢迎界面。注意，Live DVD/CD 菜单中不"
+"包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> and "
+"<guilabel>硬件检测工具</guilabel>。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:82
@@ -1902,11 +1940,13 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:91
msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
-msgstr ""
+msgstr "按 F3 键可以更改屏幕分辨率（仅用于传统模式）。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:95
@@ -1914,6 +1954,8 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:102
@@ -1922,6 +1964,8 @@ msgid ""
"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
"emphasis> key for the UEFI mode."
msgstr ""
+"按 <emphasis role=\"bold\">F6</emphasis> 键（传统模式下）或 <emphasis role="
+"\"bold\">e</emphasis> 键（UEFI 模式下）可以添加内核参数。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:104
@@ -1930,25 +1974,27 @@ msgid ""
"of the extra options. The menu called by F6 displays a new line called "
"<guilabel>Boot options</guilabel> and propose four entries:"
msgstr ""
+"若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项</"
+"guilabel>，这里提供了四个选项："
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:109
msgid "- Default, it doesn't alter anything in the default options."
-msgstr ""
+msgstr "- 默认，即使用默认选项。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:112
msgid ""
"- Safe Settings, priority is given to the safer options to the detriment of "
"performances."
-msgstr ""
+msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:115
msgid ""
"- No ACPI (Advanced Configuration and Power Interface), power management "
"isn't taken into account."
-msgstr ""
+msgstr "- 无 ACPI（高级配置与电源接口），不使用电源管理功能"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:118
@@ -1956,6 +2002,8 @@ msgid ""
"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
"about CPU interruptions, select this option if you are asked for."
msgstr ""
+"- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择"
+"此选项"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:122
@@ -1963,6 +2011,8 @@ msgid ""
"When you select one of these entries, it modifies the default options "
"displayed in the <guilabel>Boot Options</guilabel> line."
msgstr ""
+"若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选"
+"项。"
#. type: Content of: <section><itemizedlist><listitem><note><para>
#: en/installer.xml:126
@@ -1971,6 +2021,8 @@ msgid ""
"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
"however, they are really taken into account."
msgstr ""
+"在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</"
+"guilabel>中出现，但这并不影响选项发挥作用。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:133
@@ -1978,11 +2030,13 @@ msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:140
msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
+msgstr "按 F1 键可以添加更多内核参数（仅用于传统模式）。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:143
@@ -1991,6 +2045,8 @@ msgid ""
"the arrow keys and press Enter to have more details or press the Esc key to "
"go back to the welcome screen."
msgstr ""
+"按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或按 "
+"Esc 来返回到欢迎屏幕。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:150
@@ -1998,6 +2054,8 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
"</imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:157
@@ -2007,6 +2065,8 @@ msgid ""
"These options can by added by hand in the <guilabel>Boot options</guilabel> "
"line."
msgstr ""
+"有关 splash 选项的细节。按 Esc 或选择 <guilabel>返回引导选项</guilabel>可以回"
+"到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:163
@@ -2014,11 +2074,13 @@ msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
"</imageobject>"
msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
+"</imageobject>"
#. type: Content of: <section><itemizedlist><listitem><note><para>
#: en/installer.xml:171
msgid "The help is translated in the chosen language with the F2 key."
-msgstr ""
+msgstr "按 F2 键可以将帮助翻译为所选语言。"
#. type: Content of: <section><para>
#: en/installer.xml:177
@@ -2027,6 +2089,9 @@ msgid ""
"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
msgstr ""
+"有关传统引导和 UEFI 引导的内核选项，请参考：<link ns2:href=\"https://wiki."
+"mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>。"
#. type: Content of: <section><para>
#: en/installer.xml:180
@@ -2034,6 +2099,8 @@ msgid ""
"Here is the default welcome screen when using a Wired Network-based "
"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
msgstr ""
+"此处是使用有线网络安装 CD（Boot.iso 或 Boot-Nonfree.iso 镜像）安装时的默认欢"
+"迎界面："
#. type: Content of: <section><para>
#: en/installer.xml:183
@@ -2043,11 +2110,14 @@ msgid ""
"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
"iso_install\">the Mageia Wiki</link>"
msgstr ""
+"此处无法改变语言，界面中列出了可用的选项。有关使用有线网络安装 CD 来安装的更"
+"多细节，请参考 <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
+"\">Mageia Wiki</link>。"
#. type: Content of: <section><warning><para>
#: en/installer.xml:189
msgid "The keyboard layout is the American one."
-msgstr ""
+msgstr "键盘布局为美式键盘。"
#. type: Content of: <section><mediaobject>
#: en/installer.xml:193
@@ -2055,6 +2125,8 @@ msgid ""
"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/installer.xml:200
@@ -2066,7 +2138,7 @@ msgstr "安装步骤"
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
-msgstr ""
+msgstr "安装过程被分为多个步骤，可以在侧边栏看到安装进度。"
#. type: Content of: <section><section><para>
#: en/installer.xml:206
@@ -2074,6 +2146,8 @@ msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
msgstr ""
+"每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用"
+"的选项。"
#. type: Content of: <section><section><para>
#: en/installer.xml:210
@@ -2081,6 +2155,7 @@ msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
msgstr ""
+"多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
#. type: Content of: <section><section><note><para>
#: en/installer.xml:214
@@ -2094,6 +2169,10 @@ msgid ""
"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
+"若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或"
+"升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定"
+"要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 "
+"<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
#. type: Content of: <section><section><info><title>
#: en/installer.xml:228
@@ -2112,6 +2191,8 @@ msgid ""
"This can happen with some graphic cards and older systems. Try using low "
"resolution by typing <code>vgalo</code> at the prompt."
msgstr ""
+"在初始屏幕之后，可能无法显示语言选择窗口。这中情况可能发生在部分显卡和较老的"
+"系统中。请尝试在提示后输入 <code>vgalo</code> 来切换到较低分辨率。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/installer.xml:246
@@ -2122,11 +2203,14 @@ msgid ""
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
"ENTER. Now continue with the installation in text mode."
msgstr ""
+"若硬件较老，可能无法使用图形化安装程序。这种情况下，可以尝试文本安装模式：在"
+"首个欢迎界面中按 Esc，然后按 Enter。在出现的黑色屏幕中，输入“text”，然后按 "
+"Enter，即可进入文本安装模式。"
#. type: Content of: <section><section><section><info><title>
#: en/installer.xml:258
msgid "The Install Freezes"
-msgstr ""
+msgstr "安装停止"
#. type: Content of: <section><section><section><para>
#: en/installer.xml:261
@@ -2137,6 +2221,9 @@ msgid ""
"<code>noauto</code> at the prompt. This option may also be combined with "
"other options as necessary."
msgstr ""
+"若系统在安装过程中停止响应（卡死），可能是硬件检测过程出现问题。在这种情况"
+"下，可以先跳过硬件检测过程：在命令提示后输入 <code>noauto</code>。此选项也可"
+"以与其他选项联合使用。"
#. type: Content of: <section><section><section><info><title>
#: en/installer.xml:270
@@ -2151,11 +2238,14 @@ msgid ""
"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
"g. <code>mem=256M</code> would specify 256MB of RAM."
msgstr ""
+"部分情况下，硬件可能无法正确地检测可用 RAM 大小。要手动指定它，可以使用 "
+"<code>mem=xxxM</code> 参数，其中 xxx 是 RAM 的总大小。例如，<code>mem=256M</"
+"code> 表示 RAM 的大小为 256MB。"
#. type: Content of: <section><section><section><info><title>
#: en/installer.xml:281
msgid "Dynamic partitions"
-msgstr ""
+msgstr "动态分区"
#. type: Content of: <section><section><section><para>
#: en/installer.xml:284
@@ -2166,6 +2256,10 @@ msgid ""
"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
msgstr ""
+"若您在微软 Windows 中将硬盘从“basic”格式转变为“dynamic”格式，该硬盘将无法用"
+"于 Mageia 安装。要将硬盘转变回“basic”格式，请参见微软的文档：<link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>。"
#. type: Content of: <section><info><title>
#: en/installUpdates.xml:3
@@ -2183,6 +2277,9 @@ msgid ""
"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/installUpdates.xml:19
@@ -2190,6 +2287,8 @@ msgid ""
"Since this version of <application>Mageia</application> was released, some "
"packages will have been updated or improved."
msgstr ""
+"在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或"
+"改善。"
#. type: Content of: <section><para>
#: en/installUpdates.xml:23
@@ -2198,16 +2297,18 @@ msgid ""
"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
"aren't connected to the Internet"
msgstr ""
+"若您希望下载和安装更新后的软件包，请选择 <guilabel>是</guilabel>；若您不希望"
+"这样做，或无法连接到互联网，请选择 <guilabel>否</guilabel>。"
#. type: Content of: <section><para>
#: en/installUpdates.xml:28
msgid "Then press <guibutton>Next</guibutton> to continue"
-msgstr ""
+msgstr "然后按<guibutton>下一步</guibutton>继续"
#. type: Content of: <section><info><title>
#: en/login.xml:3
msgid "Login screen"
-msgstr ""
+msgstr "登录界面"
#. type: Content of: <section><mediaobject>
#: en/login.xml:7
@@ -2215,16 +2316,18 @@ msgid ""
"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
+"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
#. type: Content of: <section><mediaobject><caption><para>
#: en/login.xml:12
msgid "KDM login screen"
-msgstr ""
+msgstr "KDM 登录界面"
#. type: Content of: <section><para>
#: en/login.xml:16
msgid "Finally, you will come to the login screen."
-msgstr ""
+msgstr "最后，您将会看到登录界面。"
#. type: Content of: <section><para>
#: en/login.xml:18
@@ -2233,6 +2336,8 @@ msgid ""
"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
"you used. You can now start using your Mageia installation."
msgstr ""
+"请输入您的用户名和密码，随后您将看到 KDE 或 GNOME 桌面（根据您所选的安装介质"
+"而异）。您现在即可使用 Mageia 系统。"
#. type: Content of: <section><para>
#: en/login.xml:22
@@ -2240,6 +2345,8 @@ msgid ""
"You can find another part of our documentation in <link linkend=\"https://"
"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
msgstr ""
+"可以在 <link linkend=\"https://wiki.mageia.org/en/Category:Documentation"
+"\">Mageia wiki</link> 中找到有关系统使用的方法。"
#. type: Content of: <section><info><title>
#: en/media_selection.xml:3
@@ -2257,6 +2364,9 @@ msgid ""
"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/media_selection.xml:18
@@ -2266,13 +2376,15 @@ msgid ""
"selection determines which packages will be available for selection during "
"the next steps."
msgstr ""
+"此处列出了可用的仓库。根据所选的安装介质，并非所有仓库都可以使用。所选仓库将"
+"决定下一步中可用的软件包。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/media_selection.xml:25
msgid ""
"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
"the base of the distribution."
-msgstr ""
+msgstr "<emphasis>Core</emphasis> 仓库无法被禁用，因其包含发行版中的基础软件。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/media_selection.xml:30
@@ -2283,6 +2395,9 @@ msgid ""
"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
"cards, etc."
msgstr ""
+"<emphasis>Nonfree</emphasis> 仓库包含了免费（因此Mageia可以再分发）、但不开源"
+"的软件。例如，此仓库包含 nVidia 和 ATI 的私有显卡驱动、各类 WiFi 网卡的固件"
+"等。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/media_selection.xml:38
@@ -2293,6 +2408,9 @@ msgid ""
"Multimedia codecs needed to play various audio/video files; packages needed "
"to play commercial video DVD, etc."
msgstr ""
+"<emphasis>Tainted</emphasis> 仓库包含了在自由许可证下发布的软件。将这些软件包"
+"归入 Tainted 仓库是因为它们可能会违反部分国家（地区）的专利或版权法，例如：用"
+"于播放音频/视频文件的多媒体解码器，用于播放商业视频 DVD 的软件等。"
#. type: Content of: <section><info><title>
#: en/minimal-install.xml:12
@@ -2407,6 +2525,8 @@ msgid ""
"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
">"
msgstr ""
+"DrakX 根据您的语言设置自动选择了时区。您也可以手动改变时区。参见 <xref "
+"linkend=\"configureTimezoneUTC\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:58
@@ -2419,27 +2539,29 @@ msgid ""
"If you are not in the selected country, it is very important that you "
"correct the setting. See <xref linkend=\"selectCountry\"/>"
msgstr ""
+"若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="
+"\"selectCountry\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:67
msgid "<guilabel>Bootloader</guilabel>"
-msgstr ""
+msgstr "<guilabel>引导器</guilabel>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:69
msgid "DrakX has made good choices for the bootloader setting."
-msgstr ""
+msgstr "DrakX 为引导器进行了自动设置。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:72
msgid ""
"Do not change anything, unless you know how to configure Grub and/or Lilo"
-msgstr ""
+msgstr "不更改任何选项，除非您懂得如何配置 GRUB 和/或 Lilo"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:75
msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
+msgstr "更多信息，参见 <xref linkend=\"setupBootloader\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:80
@@ -2452,6 +2574,8 @@ msgid ""
"You can add extra users here. They will each get their own <literal>/home</"
"literal> directories."
msgstr ""
+"您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建"
+"目录。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:89
@@ -2464,18 +2588,19 @@ msgid ""
"System services refer to those small programs which run the background "
"(daemons). This tool allows you to enable or disable certain tasks."
msgstr ""
+"系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:95
msgid ""
"You should check carefully before changing anything here - a mistake may "
"prevent your computer from operating correctly."
-msgstr ""
+msgstr "在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:99
msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
+msgstr "更多信息，参见 <xref linkend=\"configureServices\"/>."
#. type: Content of: <section><section><info><title>
#: en/misc-params.xml:106
@@ -2540,6 +2665,8 @@ msgid ""
"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/misc-params.xml:156
diff --git a/docs/installer/zh_CN/DrakLive-cover.xml b/docs/installer/zh_CN/DrakLive-cover.xml
index dfb4dd80..b1d94ecb 100644
--- a/docs/installer/zh_CN/DrakLive-cover.xml
+++ b/docs/installer/zh_CN/DrakLive-cover.xml
@@ -10,20 +10,17 @@
</revision>
</revhistory>
<cover>
- <para role="tagline">The Official Documentation for Mageia</para>
+ <para role="tagline">Mageia 的官方文档</para>
<mediaobject>
<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+ <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。
</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。
</para>
- <para>It was written by volunteers in their free time. Please contact <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+ <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
</cover>
</info>
<article>
diff --git a/docs/installer/zh_CN/DrakLive.xml b/docs/installer/zh_CN/DrakLive.xml
index ea11d18b..f5dfb34c 100644
--- a/docs/installer/zh_CN/DrakLive.xml
+++ b/docs/installer/zh_CN/DrakLive.xml
@@ -7,17 +7,14 @@
<para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
</note></para>
- <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ <para xml:id="CC_BY-SA">此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
- <para>It was written by volunteers in their free time. Please contact <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+ <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
</cover>
</info>
diff --git a/docs/installer/zh_CN/DrakX-cover.xml b/docs/installer/zh_CN/DrakX-cover.xml
index c2701b57..931c352d 100644
--- a/docs/installer/zh_CN/DrakX-cover.xml
+++ b/docs/installer/zh_CN/DrakX-cover.xml
@@ -11,20 +11,17 @@
</revision>
</revhistory>
<cover>
- <para role="tagline">The Official Documentation for Mageia</para>
+ <para role="tagline">Mageia 的官方文档</para>
<mediaobject>
<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+ <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。
</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。
</para>
- <para>It was written by volunteers in their free time. Please contact <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+ <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
</cover>
</info>
<article>
diff --git a/docs/installer/zh_CN/DrakX.xml b/docs/installer/zh_CN/DrakX.xml
index 54203ded..c5404419 100644
--- a/docs/installer/zh_CN/DrakX.xml
+++ b/docs/installer/zh_CN/DrakX.xml
@@ -16,17 +16,14 @@
<para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
</note></para>
- <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ <para xml:id="CC_BY-SA">此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
- <para>It was written by volunteers in their free time. Please contact <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+ <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
</cover>
</info>
diff --git a/docs/installer/zh_CN/exitInstall.xml b/docs/installer/zh_CN/exitInstall.xml
index 8f4a6983..5a29ee90 100644
--- a/docs/installer/zh_CN/exitInstall.xml
+++ b/docs/installer/zh_CN/exitInstall.xml
@@ -19,20 +19,15 @@
format="PNG" align="center" xml:id="exitInstall-im1"> </imagedata>
</imageobject></mediaobject>
- <para revision="2" xml:id="exitInstall-pa1">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
+ <para revision="2" xml:id="exitInstall-pa1">您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。</para>
- <para revision="2" xml:id="exitInstall-pa2">After reboot, in the bootloader screen, you can choose between the operating
-systems on your computer (if you have more than one).</para>
+ <para revision="2" xml:id="exitInstall-pa2">重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系统）。</para>
- <para revision="1" xml:id="exitInstall-pa3">If you didn't adjust the settings for the bootloader, your Mageia install
-will be automatically selected and started. </para>
+ <para revision="1" xml:id="exitInstall-pa3">若您没有调整引导器的配置，将会自动启动 Mageia。 </para>
<para revision="1" xml:id="exitInstall-pa4">Enjoy!</para>
- <para revision="1" xml:id="exitInstall-pa5">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia </para>
+ <para revision="1" xml:id="exitInstall-pa5">若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。 </para>
</section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/formatPartitions.xml b/docs/installer/zh_CN/formatPartitions.xml
index e9d86c16..7b56dbc0 100644
--- a/docs/installer/zh_CN/formatPartitions.xml
+++ b/docs/installer/zh_CN/formatPartitions.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="formatPartitions">
<info>
- <title xml:id="formatPartitions-ti1">Formatting</title>
+ <title xml:id="formatPartitions-ti1">格式化</title>
</info>
@@ -26,21 +26,15 @@ condition='live'> <imagedata revision="1"
fileref="live-formatPartitions.png" format="PNG" align="center"
xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
- <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
-partitions <emphasis>not</emphasis> marked for formatting will be saved.</para>
+ <para revision="2" xml:id="formatPartitions-pa1">这里您可以选择要格式化的分区。<emphasis>未标记为格式化</emphasis>的分区上的数据将会被保留。</para>
- <para revision="1" xml:id="formatPartitions-pa2">Usually at least the partitions DrakX selected, need to be formatted</para>
+ <para revision="1" xml:id="formatPartitions-pa2">一般情况下，DrakX 自动选择的分区需要被格式化。</para>
- <para revision="1" xml:id="formatPartitions-pa3">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+ <para revision="1" xml:id="formatPartitions-pa3">可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>的分区。</para>
<tip>
- <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen.
-In that screen you can choose to view what is in your partitions.</para>
+ <para revision="1" xml:id="formatPartitions-pa4">若您不确定所做选择是否正确，可以点击两次 <guibutton>上一页</guibutton>回到主界面，然后查看相应分区中的数据。</para>
</tip>
- <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
+ <para revision="1" xml:id="formatPartitions-pa5">若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。</para>
</section>
diff --git a/docs/installer/zh_CN/installUpdates.xml b/docs/installer/zh_CN/installUpdates.xml
index db6218af..94db8220 100644
--- a/docs/installer/zh_CN/installUpdates.xml
+++ b/docs/installer/zh_CN/installUpdates.xml
@@ -18,14 +18,12 @@
format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
</imageobject></mediaobject>
- <para revision="1" xml:id="installUpdates-pa1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+ <para revision="1" xml:id="installUpdates-pa1">在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或改善。</para>
- <para revision="1" xml:id="installUpdates-pa2">Choose <guilabel>yes</guilabel> if you wish to download and install them,
-select <guilabel>no</guilabel> if you don't want to do this now, or if you
-aren't connected to the Internet</para>
+ <para revision="1" xml:id="installUpdates-pa2">若您希望下载和安装更新后的软件包，请选择 <guilabel>是</guilabel>；若您不希望这样做，或无法连接到互联网，请选择
+<guilabel>否</guilabel>。</para>
- <para revision="1" xml:id="installUpdates-pa3">Then press <guibutton>Next</guibutton> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">然后按<guibutton>下一步</guibutton>继续</para>
</section>
\ No newline at end of file
diff --git a/docs/installer/zh_CN/installer.xml b/docs/installer/zh_CN/installer.xml
index 58548add..d6fd3ecb 100644
--- a/docs/installer/zh_CN/installer.xml
+++ b/docs/installer/zh_CN/installer.xml
@@ -20,12 +20,10 @@
<!-- JohnR - apparent corruption is caused by the positioning of this comment block
- corrected Lebarhon : I put [] where it seems having mistakes -->
<!-- barjac 18/04/2012 Commented out para relating to peripherals, as it's apparently wrong -->
-<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+<title xml:id="installer-ti1">DrakX，Mageia 的安装器</title>
</info>
- <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
-Installer is designed to help make your installation or upgrade as easy as
-possible.</para>
+ <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para>
@@ -33,16 +31,14 @@ possible.</para>
If you have peripherals like printers or scanners, it is [best] to
connect them and make sure they are powered up during installation. These
will be automatically detected and configured.</para> -->
-<para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+<para>初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。</para>
<figure xml:id="dx-welcome">
<info>
- <title xml:id="installer-ti2">Installation Welcome Screen</title>
+ <title xml:id="installer-ti2">安装欢迎屏幕</title>
</info>
- <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with a legacy system and the second one with an UEFI system:
+ <para>此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二个是使用 UEFI 引导的系统。
</para>
<mediaobject>
@@ -53,12 +49,11 @@ align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediao
<imageobject> <imagedata fileref="dx-welcome2.png" align="center"/>
</imageobject></mediaobject>
- <para>From this first screen, it is possible to set some personal preferences:</para>
+ <para>在此页中，可以进行自定义设置：</para>
<itemizedlist>
<listitem>
- <para>The language (for the installation only, may be different that the chosen
-language for the system) by pressing the key F2 (Legacy mode only)</para>
+ <para>按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。</para>
<para/>
@@ -66,12 +61,11 @@ language for the system) by pressing the key F2 (Legacy mode only)</para>
<imageobject> <imagedata fileref="dx-welcome-lang.png" align="center"/>
</imageobject></mediaobject>
- <para>Use the arrow keys to select the language and press the key Enter.</para>
+ <para>使用方向键来选择语言，然后按 Enter 键。</para>
- <para>Here is for example, the French welcome screen when using a Live
-DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
-System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-Detection Tool</guilabel>.</para>
+ <para>此处给出了使用 Live DVD/CD 安装时法语版的欢迎界面。注意，Live DVD/CD
+菜单中不包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> and
+<guilabel>硬件检测工具</guilabel>。</para>
<para/>
@@ -83,7 +77,7 @@ Detection Tool</guilabel>.</para>
</listitem>
<listitem>
- <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
+ <para>按 F3 键可以更改屏幕分辨率（仅用于传统模式）。</para>
<mediaobject>
<imageobject> <imagedata fileref="dx-welcome5def.png" align="center"/>
@@ -91,32 +85,23 @@ Detection Tool</guilabel>.</para>
</listitem>
<listitem>
- <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
-key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
-the UEFI mode.</para>
+ <para>按 <emphasis role="bold">F6</emphasis> 键（传统模式下）或 <emphasis
+role="bold">e</emphasis> 键（UEFI 模式下）可以添加内核参数。</para>
- <para>If the installation fails, then it may be necessary to try again using one
-of the extra options. The menu called by F6 displays a new line called
-<guilabel>Boot options</guilabel> and propose four entries:</para>
+ <para>若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项</guilabel>，这里提供了四个选项：</para>
- <para>- Default, it doesn't alter anything in the default options.</para>
+ <para>- 默认，即使用默认选项。</para>
- <para>- Safe Settings, priority is given to the safer options to the detriment of
-performances.</para>
+ <para>- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）</para>
- <para>- No ACPI (Advanced Configuration and Power Interface), power management
-isn't taken into account.</para>
+ <para>- 无 ACPI（高级配置与电源接口），不使用电源管理功能</para>
- <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
-about CPU interruptions, select this option if you are asked for.</para>
+ <para>- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择此选项</para>
- <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
+ <para>若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选项。</para>
<note>
- <para>In some Mageia releases, it may happen that the entries selected with the
-key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
-however, they are really taken into account.</para>
+ <para>在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</guilabel>中出现，但这并不影响选项发挥作用。</para>
</note>
<mediaobject>
@@ -125,11 +110,9 @@ however, they are really taken into account.</para>
</listitem>
<listitem>
- <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
+ <para>按 F1 键可以添加更多内核参数（仅用于传统模式）。</para>
- <para>Pressing F1 opens a new window with more available options. Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+ <para>按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或按 Esc 来返回到欢迎屏幕。</para>
<para/>
@@ -139,10 +122,8 @@ go back to the welcome screen.</para>
<para/>
- <para>The detailed view about the option splash. Press Esc or select
-<guilabel>Return to Boot Options</guilabel> to go back to the options
-list. These options can by added by hand in the <guilabel>Boot
-options</guilabel> line.</para>
+ <para>有关 splash 选项的细节。按 Esc 或选择
+<guilabel>返回引导选项</guilabel>可以回到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。</para>
<mediaobject>
<imageobject> <imagedata align="center" fileref="dx-welcomeHelp2.png"/>
@@ -151,26 +132,21 @@ options</guilabel> line.</para>
<para/>
<note>
- <para>The help is translated in the chosen language with the F2 key.</para>
+ <para>按 F2 键可以将帮助翻译为所选语言。</para>
</note>
</listitem>
</itemizedlist>
- <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
+ <para>有关传统引导和 UEFI 引导的内核选项，请参考：<link
+ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>。</para>
- <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+ <para>此处是使用有线网络安装 CD（Boot.iso 或 Boot-Nonfree.iso 镜像）安装时的默认欢迎界面：</para>
- <para>It does not allow to change the language, the available options are
-described in the screen. For more information about using a Wired
-Network-based Installation CD, see <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-Wiki</link></para>
+ <para>此处无法改变语言，界面中列出了可用的选项。有关使用有线网络安装 CD 来安装的更多细节，请参考 <link
+ns2:href="https://wiki.mageia.org/en/Boot.iso_install">Mageia Wiki</link>。</para>
<warning>
- <para>The keyboard layout is the American one.</para>
+ <para>键盘布局为美式键盘。</para>
</warning>
<mediaobject>
@@ -182,25 +158,16 @@ format="PNG" fileref="../dx-help.png"/> </imageobject></mediaobject>
<title xml:id="installationSteps-ti1">安装步骤</title>
</info>
- <para>The install process is divided into a number of steps, which can be followed
-on the side panel of the screen.</para>
+ <para>安装过程被分为多个步骤，可以在侧边栏看到安装进度。</para>
- <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> buttons with extra, less commonly required,
-options.</para>
+ <para>每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用的选项。</para>
- <para>Most screens have <guibutton>Help</guibutton> buttons which give further
-explanations about the current step.</para>
+ <para>多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。</para>
<note>
- <para>If somewhere during install you decide to stop the installation, it is
-possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
+ <para>若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定要重启，可以按
+<guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 <guibutton>Alt Ctrl
+Delete</guibutton> 来触发重启操作。</para>
</note>
</section>
@@ -216,31 +183,24 @@ rebooting is what you want, go to a text terminal by pressing the three keys
<itemizedlist>
<listitem>
- <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+ <para>在初始屏幕之后，可能无法显示语言选择窗口。这中情况可能发生在部分显卡和较老的系统中。请尝试在提示后输入 <code>vgalo</code>
+来切换到较低分辨率。</para>
</listitem>
<listitem>
- <para revision="2">If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this hit ESC at the first welcome screen and confirm with ENTER. You will be
-presented with a black screen with the word "boot:". Type "text" and hit
-ENTER. Now continue with the installation in text mode.</para>
+ <para revision="2">若硬件较老，可能无法使用图形化安装程序。这种情况下，可以尝试文本安装模式：在首个欢迎界面中按 Esc，然后按
+Enter。在出现的黑色屏幕中，输入“text”，然后按 Enter，即可进入文本安装模式。</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="installFreezes">
<info>
- <title xml:id="installFreezes-ti1">The Install Freezes</title>
+ <title xml:id="installFreezes-ti1">安装停止</title>
</info>
- <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+ <para>若系统在安装过程中停止响应（卡死），可能是硬件检测过程出现问题。在这种情况下，可以先跳过硬件检测过程：在命令提示后输入
+<code>noauto</code>。此选项也可以与其他选项联合使用。</para>
</section>
<section xml:id="kernelOptions">
@@ -248,22 +208,18 @@ other options as necessary.</para>
<title xml:id="kernelOptions-ti1">内存问题</title>
</info>
- <para>These will rarely be needed, but in some cases the hardware may report the
-available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+ <para>部分情况下，硬件可能无法正确地检测可用 RAM 大小。要手动指定它，可以使用 <code>mem=xxxM</code> 参数，其中 xxx 是 RAM
+的总大小。例如，<code>mem=256M</code> 表示 RAM 的大小为 256MB。</para>
</section>
<section xml:id="DynamicPartitions">
<info>
- <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
+ <title xml:id="DynamicPartitions-ti1">动态分区</title>
</info>
- <para>If you converted your hard disk from "basic" format to "dynamic" format on
-Microsoft Windows, you must know that it is impossible to install Mageia on
-this disc. To go back to a basic disk, see the Microsoft documentation:
-<link
-ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+ <para>若您在微软 Windows 中将硬盘从“basic”格式转变为“dynamic”格式，该硬盘将无法用于 Mageia
+安装。要将硬盘转变回“basic”格式，请参见微软的文档：<link
+ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>。</para>
</section>
</section>
</section>
diff --git a/docs/installer/zh_CN/login.xml b/docs/installer/zh_CN/login.xml
index 9a9f1e63..1349d462 100644
--- a/docs/installer/zh_CN/login.xml
+++ b/docs/installer/zh_CN/login.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="login" version="5.0" xml:lang="zh_CN">
<info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
+ <title xml:id="label-to-adapt-ti1">登录界面</title>
</info>
<mediaobject condition="live">
@@ -8,17 +8,14 @@
format="PNG" fileref="live-login.png"/> </imageobject>
<caption>
- <para>KDM login screen</para>
+ <para>KDM 登录界面</para>
</caption>
</mediaobject>
- <para>Finally, you will come to the login screen.</para>
+ <para>最后，您将会看到登录界面。</para>
- <para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
+ <para>请输入您的用户名和密码，随后您将看到 KDE 或 GNOME 桌面（根据您所选的安装介质而异）。您现在即可使用 Mageia 系统。</para>
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
+ <para>可以在 <link linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
+wiki</link> 中找到有关系统使用的方法。</para>
</section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/media_selection.xml b/docs/installer/zh_CN/media_selection.xml
index 59fa6f49..8701ca1c 100644
--- a/docs/installer/zh_CN/media_selection.xml
+++ b/docs/installer/zh_CN/media_selection.xml
@@ -16,31 +16,21 @@
<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
- <para>Here you have the list of available repositories. Not all repositories are
-available, according to which media you use for installing. The repositories
-selection determines which packages will be available for selection during
-the next steps.</para>
+ <para>此处列出了可用的仓库。根据所选的安装介质，并非所有仓库都可以使用。所选仓库将决定下一步中可用的软件包。</para>
<itemizedlist>
<listitem>
- <para>The <emphasis>Core</emphasis> repository cannot be disabled as it contains
-the base of the distribution.</para>
+ <para><emphasis>Core</emphasis> 仓库无法被禁用，因其包含发行版中的基础软件。</para>
</listitem>
<listitem>
- <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
-free-of-charge, i.e. Mageia may redistribute them, but they contain
-closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
-firmware for various WiFi cards, etc.</para>
+ <para><emphasis>Nonfree</emphasis> 仓库包含了免费（因此Mageia可以再分发）、但不开源的软件。例如，此仓库包含 nVidia
+和 ATI 的私有显卡驱动、各类 WiFi 网卡的固件等。</para>
</listitem>
<listitem>
- <para>The <emphasis>Tainted</emphasis> repository includes packages released under
-a free license. The main criteria for placing packages in this repository is
-that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+ <para><emphasis>Tainted</emphasis> 仓库包含了在自由许可证下发布的软件。将这些软件包归入 Tainted
+仓库是因为它们可能会违反部分国家（地区）的专利或版权法，例如：用于播放音频/视频文件的多媒体解码器，用于播放商业视频 DVD 的软件等。</para>
</listitem>
</itemizedlist>
</section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/misc-params.xml b/docs/installer/zh_CN/misc-params.xml
index 3fa6e2c4..13d14c08 100644
--- a/docs/installer/zh_CN/misc-params.xml
+++ b/docs/installer/zh_CN/misc-params.xml
@@ -58,45 +58,39 @@ settings here and change them if you want after pressing
<listitem>
<para xml:id="misc-params-system-pa2" revision="1"><guilabel>时区</guilabel></para>
- <para xml:id="misc-params-system-pa2a" revision="1">DrakX selected a time zone for you, depending on your preferred
-language. You can change it if needed. See also <xref
-linkend="configureTimezoneUTC"/></para>
+ <para xml:id="misc-params-system-pa2a" revision="1">DrakX 根据您的语言设置自动选择了时区。您也可以手动改变时区。参见 <xref linkend="configureTimezoneUTC"/></para>
</listitem>
<listitem>
<para xml:id="misc-params-system-pa3" revision="1"><guilabel>国家/地区</guilabel></para>
- <para revision="1" xml:id="misc-params-system-pa3a">If you are not in the selected country, it is very important that you
-correct the setting. See <xref linkend="selectCountry"/></para>
+ <para revision="1" xml:id="misc-params-system-pa3a">若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="selectCountry"/></para>
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa4" revision="1"><guilabel>Bootloader</guilabel></para>
+ <para xml:id="misc-params-system-pa4" revision="1"><guilabel>引导器</guilabel></para>
- <para revision="2" xml:id="misc-params-system-pa4a">DrakX has made good choices for the bootloader setting.</para>
+ <para revision="2" xml:id="misc-params-system-pa4a">DrakX 为引导器进行了自动设置。</para>
- <para revision="2" xml:id="misc-params-system-pa4b">Do not change anything, unless you know how to configure Grub and/or Lilo</para>
+ <para revision="2" xml:id="misc-params-system-pa4b">不更改任何选项，除非您懂得如何配置 GRUB 和/或 Lilo</para>
- <para revision="2" xml:id="misc-params-system-pa4c">For more information, see <xref linkend="setupBootloader"/></para>
+ <para revision="2" xml:id="misc-params-system-pa4c">更多信息，参见 <xref linkend="setupBootloader"/></para>
</listitem>
<listitem>
<para revision="1" xml:id="misc-params-system-pa5"><guilabel>用户管理</guilabel></para>
- <para revision="2" xml:id="misc-params-system-pa5a">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+ <para revision="2" xml:id="misc-params-system-pa5a">您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建目录。</para>
</listitem>
<listitem>
<para revision="1" xml:id="misc-params-system-pa6"><guilabel>服务</guilabel>:</para>
- <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run the background
-(daemons). This tool allows you to enable or disable certain tasks.</para>
+ <para xml:id="misc-params-system-pa6a" revision="1">系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。</para>
- <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
+ <para xml:id="misc-params-system-pa6b" revision="1">在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。</para>
- <para>For more information, see <xref linkend="configureServices"/></para>
+ <para>更多信息，参见 <xref linkend="configureServices"/>.</para>
</listitem>
</itemizedlist>
</section>
diff --git a/docs/mcc-help/de.po b/docs/mcc-help/de.po
index 411ba1da..0b385720 100644
--- a/docs/mcc-help/de.po
+++ b/docs/mcc-help/de.po
@@ -23,7 +23,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2016-02-26 22:38+0200\n"
-"PO-Revision-Date: 2016-05-23 19:54+0000\n"
+"PO-Revision-Date: 2016-05-26 17:39+0000\n"
"Last-Translator: Nicolas Peifer\n"
"Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
"de/)\n"
@@ -9243,6 +9243,13 @@ msgid ""
"configuration of the options CHECK_PERMS and CHECK_PERMS_ENFORCE in the "
"<emphasis role=\"bold\">Periodic Checks tab </emphasis>."
msgstr ""
+"Bitte beachten Sie: Haben Sie im Reiter <emphasis role=\"bold"
+"\">Berechtigungen</emphasis> für eine bestimmte Datei das Kästchen "
+"<guilabel>Erzwingen</guilabel> angekreuzt und ändern Sie die Berechtigungen "
+"für diese Datei per Konsole oder Dateimanager, so wird msec die alten "
+"Berechtigungen nach einer Weile wiederherstellen. Die Wiederherstellung "
+"erfolgt gemäß den Optionen CHECK_PERMS and CHECK_PERMS_ENFORCE im Reiter "
+"<emphasis role=\"bold\">Regelmäßige Checks</emphasis>."
#. type: Content of: <section><info><title>
#: en/otherMageiaTools.xml:4
@@ -9274,6 +9281,7 @@ msgstr "<xref linkend=\"drakbug_report\"/><emphasis>drakbug_report </emphasis>"
#: en/otherMageiaTools.xml:21
msgid "<xref linkend=\"lsnetdrake\"/><emphasis>TO BE WRITTEN </emphasis>"
msgstr ""
+"<xref linkend=\"lsnetdrake\"/><emphasis>MUSS NOCH VERFASST WERDEN</emphasis>"
#. type: Content of: <section><orderedlist><listitem><para>
#: en/otherMageiaTools.xml:25
@@ -10000,6 +10008,8 @@ msgid ""
"<emphasis>/etc/sane.d/dll.conf </emphasis>to add or comment the directive "
"\"net\""
msgstr ""
+"<emphasis>/etc/sane.d/dll.conf</emphasis> um die Direktive \"net\" "
+"hinzuzufügen oder zu kommentieren."
#. type: Content of: <section><section><para>
#: en/scannerdrake.xml:193
@@ -10082,6 +10092,12 @@ msgid ""
"firmware from a CD or a Windows installation, or install the one you "
"downloaded from an Internet site of the vendor."
msgstr ""
+"In manchen Fällen wird Ihnen angezeigt, dass die Firmware des Scanners bei "
+"jedem Start geladen werden muss. Nachdem Sie die Firmware auf Ihren Computer "
+"geladen haben, können Sie mit diesem Werkzeug die Firmware auf das Gerät "
+"laden. In diesem Dialog können Sie die Firmware von einer CD oder von einer "
+"Windows-Installation installieren oder Sie können die Firmware installieren, "
+"die Sie von der Internetseite des Scannerherstellers heruntergeladen haben."
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/scannerdrake.xml:241
@@ -10099,6 +10115,9 @@ msgid ""
"Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/"
"\"name_of_your_SANE_backend\".conf file.</emphasis>"
msgstr ""
+"Ihnen dürfte auch ein Bildschirm angezeigt werden, der Sie dazu auffordert, "
+"die Datei <emphasis>/etc/sane.d/\"name_of_your_SANE_backend\".conf</"
+"emphasis> anzupassen."
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/scannerdrake.xml:250
@@ -10107,6 +10126,9 @@ msgid ""
"what to do, feel free to ask for help in the <link xlink:href=\"http://"
"forums.mageia.org/en/\">forums</link>."
msgstr ""
+"Lesen Sie die vorliegenden Informationen (oder andere) sorgfältig und falls "
+"Sie nicht weiter wissen, können Sie gerne in den <link xlink:href=\"http://"
+"forums.mageia.org/en/\">Foren</link> um Rat fragen."
#. type: Content of: <section><orderedlist><title>
#: en/software-management.xml:5 en/software-management.xml:15
@@ -10419,6 +10441,12 @@ msgid ""
"and give the IP address of the printer in the box on the right, where it "
"says \"host\"."
msgstr ""
+"Sie können Ihren Netzwerk-Drucker hinzufügen, indem Sie das Protokoll "
+"auswählen, mit dem Ihr Drucker mit Ihrem Computer über das Netzwerk "
+"kommuniziert. Falls Sie das Protokoll nicht kennen, können Sie im Menü "
+"<guilabel>Gerät wählen</guilabel> die Option <guilabel>Netzwerkdrucker</"
+"guilabel> - <guilabel>Netzwerkdrucker finden</guilabel> wählen und die IP-"
+"Adresse des Druckers in das Feld \"Host\" auf der rechten Seite eingeben."
#. type: Content of: <section><section><para>
#: en/system-config-printer.xml:149
@@ -10427,6 +10455,10 @@ msgid ""
"protocol and a queue, but you can choose a more appropriate one from the "
"list below it or give the correct queue name if it isn't in the list."
msgstr ""
+"Wenn das Werkzeug Ihren Drucker oder Druckerserver erkennt, wird es ein "
+"Protokoll vorschlagen und eine Warteschlange, aber Sie können auch eine "
+"passendere Warteschlange aus der Liste darunter auswählen oder den richtigen "
+"Warteschlangennamen angeben, falls er nicht in der Liste aufgeführt ist."
#. type: Content of: <section><section><para>
#: en/system-config-printer.xml:154
@@ -10456,6 +10488,16 @@ msgid ""
"net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is "
"not required."
msgstr ""
+"EIne aktuelle Technologie, die von Hewlett-Packard entwickelt wird, heißt "
+"JetDirect. Sie erlaubt den Zugriff auf einen Drucker, der direkt mit dem "
+"Netzwerk verbunden ist. Sie müssen die IP-Adresse kennen, unter der der "
+"Drucker im Netzwerk erreichbar ist. Die JetDirect-Technologie wird auch von "
+"ADSL-Routern verwendet, die einen USB-Anschluss für einen Drucker besitzen. "
+"In diesem Fall benötigen Sie die IP-Adresse Ihres Routers. Bitte beachten "
+"Sie, dass das Werkzeug \"HP Gerätemanager\" dynamische IP-Adressen verwalten "
+"kann und dazu eine URI wie beispielsweise <emphasis>hp:/net/&lt;Name-Ihres-"
+"Druckers></emphasis> vergeben kann. In diesem Fall wird eine feste IP-"
+"Adresse nicht benötigt."
#. type: Content of: <section><section><para>
#: en/system-config-printer.xml:172
diff --git a/docs/mcc-help/de/msecgui.xml b/docs/mcc-help/de/msecgui.xml
index 68d213c5..7957c141 100644
--- a/docs/mcc-help/de/msecgui.xml
+++ b/docs/mcc-help/de/msecgui.xml
@@ -374,12 +374,13 @@ die Änderungen direkt übernommen werden, verwende mit root-Rechten den
Befehl msecperms in der Konsole. Sie können vorher den Befehl msecperms -p
verwenden, um die Berechtigungen anzuzeigen, welche durch msecperms geändert
werden.</para></caution>
- <caution><para>Do not forget that if you modify the permissions in a console or in a file
-manager, for a file where the box <guilabel>Enforce </guilabel> is checked
-in the <emphasis role="bold">Permissions tab </emphasis>, msecgui will write
-the old permissions back after a while, accordingly to the configuration of
-the options CHECK_PERMS and CHECK_PERMS_ENFORCE in the <emphasis
-role="bold">Periodic Checks tab </emphasis>.</para></caution>
+ <caution><para>Bitte beachten Sie: Haben Sie im Reiter <emphasis
+role="bold">Berechtigungen</emphasis> für eine bestimmte Datei das Kästchen
+<guilabel>Erzwingen</guilabel> angekreuzt und ändern Sie die Berechtigungen
+für diese Datei per Konsole oder Dateimanager, so wird msec die alten
+Berechtigungen nach einer Weile wiederherstellen. Die Wiederherstellung
+erfolgt gemäß den Optionen CHECK_PERMS and CHECK_PERMS_ENFORCE im Reiter
+<emphasis role="bold">Regelmäßige Checks</emphasis>.</para></caution>
</section>
</section>
</section>
diff --git a/docs/mcc-help/de/otherMageiaTools.xml b/docs/mcc-help/de/otherMageiaTools.xml
index 2b0cc252..1c34ca60 100644
--- a/docs/mcc-help/de/otherMageiaTools.xml
+++ b/docs/mcc-help/de/otherMageiaTools.xml
@@ -19,7 +19,7 @@ mehr darüber zu erfahren oder lese auf der nächsten Seite weiter.</para>
</listitem>
<listitem>
- <para><xref linkend="lsnetdrake"/><emphasis>TO BE WRITTEN </emphasis></para>
+ <para><xref linkend="lsnetdrake"/><emphasis>MUSS NOCH VERFASST WERDEN</emphasis></para>
</listitem>
<listitem>
<para><xref linkend="lspcidrake"/></para>
diff --git a/docs/mcc-help/de/scannerdrake.xml b/docs/mcc-help/de/scannerdrake.xml
index a7b6f7e0..ab3a67e1 100644
--- a/docs/mcc-help/de/scannerdrake.xml
+++ b/docs/mcc-help/de/scannerdrake.xml
@@ -190,8 +190,8 @@ bietet das Werkzeug an, dies zu tun.</para>
<para><emphasis>/etc/sane.d/net.conf</emphasis></para>
- <para><emphasis>/etc/sane.d/dll.conf </emphasis>to add or comment the directive
-"net"</para>
+ <para><emphasis>/etc/sane.d/dll.conf</emphasis> um die Direktive "net"
+hinzuzufügen oder zu kommentieren.</para>
<para>Es konfiguriert auch <emphasis>saned</emphasis> und
<emphasis>xinetd</emphasis> so, dass es während des Bootvorgangs gestartet
@@ -242,25 +242,27 @@ Schritte durchführen müssen um Ihren Scanner vollständig einzurichten.</para>
<itemizedlist>
<listitem>
-<para>In some cases, you're told the scanner needs its firmware to be uploaded
-each time it is started. This tool allows you to load it into the device,
-after you installed it on your system. In this screen you can install the
-firmware from a CD or a Windows installation, or install the one you
-downloaded from an Internet site of the vendor.</para><para>
+<para>In manchen Fällen wird Ihnen angezeigt, dass die Firmware des Scanners bei
+jedem Start geladen werden muss. Nachdem Sie die Firmware auf Ihren Computer
+geladen haben, können Sie mit diesem Werkzeug die Firmware auf das Gerät
+laden. In diesem Dialog können Sie die Firmware von einer CD oder von einer
+Windows-Installation installieren oder Sie können die Firmware installieren,
+die Sie von der Internetseite des Scannerherstellers heruntergeladen haben.</para><para>
Wenn die Firmware Ihres Gerätes geladen werden muss, kann dies bei jeder
Erstbenutzung einige Zeit dauern, womöglich auch länger als eine
Minute. Gedulden Sie sich ein wenig.</para>
</listitem>
<listitem>
-<para>Also, you may get a screen telling you to adjust the
-<emphasis>/etc/sane.d/"name_of_your_SANE_backend".conf file.</emphasis> </para>
+<para>Ihnen dürfte auch ein Bildschirm angezeigt werden, der Sie dazu auffordert,
+die Datei <emphasis>/etc/sane.d/"name_of_your_SANE_backend".conf</emphasis>
+anzupassen. </para>
</listitem>
<listitem>
-<para>Read those or other instructions you get carefully and if you don't know
-what to do, feel free to ask for help in the <link
-xlink:href="http://forums.mageia.org/en/">forums</link>.</para>
+<para>Lesen Sie die vorliegenden Informationen (oder andere) sorgfältig und falls
+Sie nicht weiter wissen, können Sie gerne in den <link
+xlink:href="http://forums.mageia.org/en/">Foren</link> um Rat fragen.</para>
</listitem>
</itemizedlist>
diff --git a/docs/mcc-help/de/system-config-printer.xml b/docs/mcc-help/de/system-config-printer.xml
index aed01f8e..6ee978e5 100644
--- a/docs/mcc-help/de/system-config-printer.xml
+++ b/docs/mcc-help/de/system-config-printer.xml
@@ -146,16 +146,18 @@ root <emphasis><code>ifconfig</code></emphasis> ausführen, um die
MAC-Adresse anzeigen zu lassen. Es ist eine Zusammenstellung aus Nummern und
Buchstaben nach "HWaddr".</para>
- <para>You can add your network printer by choosing the protocol it uses to talk to
-your computer over the network. If you don't know which protocol to choose,
-you can try the <guilabel>Network Printer</guilabel> - <guilabel>Find
-Network Printer</guilabel> option in the <guilabel>Devices</guilabel> menu
-and give the IP address of the printer in the box on the right, where it
-says "host".</para>
-
- <para>If the tool recognises your printer or printserver, it will propose a
-protocol and a queue, but you can choose a more appropriate one from the
-list below it or give the correct queue name if it isn't in the list.</para>
+ <para>Sie können Ihren Netzwerk-Drucker hinzufügen, indem Sie das Protokoll
+auswählen, mit dem Ihr Drucker mit Ihrem Computer über das Netzwerk
+kommuniziert. Falls Sie das Protokoll nicht kennen, können Sie im Menü
+<guilabel>Gerät wählen</guilabel> die Option
+<guilabel>Netzwerkdrucker</guilabel> - <guilabel>Netzwerkdrucker
+finden</guilabel> wählen und die IP-Adresse des Druckers in das Feld "Host"
+auf der rechten Seite eingeben.</para>
+
+ <para>Wenn das Werkzeug Ihren Drucker oder Druckerserver erkennt, wird es ein
+Protokoll vorschlagen und eine Warteschlange, aber Sie können auch eine
+passendere Warteschlange aus der Liste darunter auswählen oder den richtigen
+Warteschlangennamen angeben, falls er nicht in der Liste aufgeführt ist.</para>
<para>Schauen Sie in die Beschreibung, welche Sie mit Ihrem Drucker oder
Druckserver erhalten haben, um herauszufinden welche(s) Protokoll(e) dieser
@@ -165,15 +167,16 @@ unterstützt und für mögliche festgelegte Namen der Druckerwarteschlange.</par
<section xml:id="network_printing_protocols">
<title>Netzwerkdruck-Protokolle</title>
- <para>One current technique is one developed by Hewlett-Packard and known as
-JetDirect. It allows access to a printer directly connected to the network
-via an Ethernet port. You must know the IP-address at which the printer is
-known on the network. This technique is also used inside some ADSL-routers
-which contain an USB port to connect the printer. In this case, the
-IP-address is that of the router. Note that the tool "Hp Device manager" can
-manage dynamically configured IP-adress, setting an URI like
-<emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case, fixed
-IP-adress is not required.</para>
+ <para>EIne aktuelle Technologie, die von Hewlett-Packard entwickelt wird, heißt
+JetDirect. Sie erlaubt den Zugriff auf einen Drucker, der direkt mit dem
+Netzwerk verbunden ist. Sie müssen die IP-Adresse kennen, unter der der
+Drucker im Netzwerk erreichbar ist. Die JetDirect-Technologie wird auch von
+ADSL-Routern verwendet, die einen USB-Anschluss für einen Drucker
+besitzen. In diesem Fall benötigen Sie die IP-Adresse Ihres Routers. Bitte
+beachten Sie, dass das Werkzeug "HP Gerätemanager" dynamische IP-Adressen
+verwalten kann und dazu eine URI wie beispielsweise
+<emphasis>hp:/net/&lt;Name-Ihres-Druckers></emphasis> vergeben kann. In
+diesem Fall wird eine feste IP-Adresse nicht benötigt.</para>
<para>Choose the option <guilabel>AppSocket/HP JetDirect</guilabel> as the
protocol and set the address in <guilabel>Host:</guilabel>, do not change
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-05 20:37:58 +0000