diff options
author | Marc Lattemann <marc.lattemann@web.de> | 2017-10-23 20:09:42 +0200 |
---|---|---|
committer | Marc Lattemann <marc.lattemann@web.de> | 2017-10-23 20:09:42 +0200 |
commit | 57cd2d6804d1f18f854da15106f1fa402920db24 (patch) | |
tree | 05eb2c5356fedb2fe8e4f30834cfa23dc1806fc3 | |
parent | fc3d6eedc9e07aba02ae35c2d3c6092cc29e72f7 (diff) | |
parent | 2f7f3cca2cb68b4e18ea8334727851325e039233 (diff) | |
download | tools-57cd2d6804d1f18f854da15106f1fa402920db24.tar tools-57cd2d6804d1f18f854da15106f1fa402920db24.tar.gz tools-57cd2d6804d1f18f854da15106f1fa402920db24.tar.bz2 tools-57cd2d6804d1f18f854da15106f1fa402920db24.tar.xz tools-57cd2d6804d1f18f854da15106f1fa402920db24.zip |
Merge branch 'master' of git://git.mageia.org/software/i18n/tools
-rw-r--r-- | docs/bootiso/zh_CN.po | 7 | ||||
-rw-r--r-- | docs/bootiso/zh_CN/NetInstall-cover.xml | 2 | ||||
-rw-r--r-- | docs/installer/hu.po | 10 | ||||
-rw-r--r-- | docs/installer/hu/acceptLicense.xml | 6 | ||||
-rw-r--r-- | docs/mcc-help/zh_CN.po | 37 | ||||
-rw-r--r-- | docs/mcc-help/zh_CN/drakboot.xml | 5 | ||||
-rw-r--r-- | docs/mcc-help/zh_CN/draksambashare.xml | 2 |
7 files changed, 26 insertions, 43 deletions
diff --git a/docs/bootiso/zh_CN.po b/docs/bootiso/zh_CN.po index 181b7af5..f176959d 100644 --- a/docs/bootiso/zh_CN.po +++ b/docs/bootiso/zh_CN.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the Mageia Boot ISO Help package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2017-05-23 19:44+0300\n" +"POT-Creation-Date: 2017-06-06 19:43+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/MageiaLinux/" @@ -595,12 +596,12 @@ msgstr "使用微型镜像来安装" #. type: Content of: <book><info><cover><para> #: en/NetInstall-cover.xml:14 msgid "The tool to install Mageia with remote repositories" -msgstr "" +msgstr "使用远程仓库来安装Mageia的工具" #. type: Attribute 'fileref' of: <book><info><cover><mediaobject><imageobject><imagedata> #: en/NetInstall-cover.xml:17 msgid "../mageia-2013.png" -msgstr "" +msgstr "../mageia-2013.png" #. type: Content of: <article><info><cover><para> #: en/NetInstall-cover.xml:21 en/NetInstall.xml:12 diff --git a/docs/bootiso/zh_CN/NetInstall-cover.xml b/docs/bootiso/zh_CN/NetInstall-cover.xml index d99c63ef..9aeada8b 100644 --- a/docs/bootiso/zh_CN/NetInstall-cover.xml +++ b/docs/bootiso/zh_CN/NetInstall-cover.xml @@ -11,7 +11,7 @@ <info> <title>使用微型镜像来安装</title> <cover> - <para role="tagline">The tool to install Mageia with remote repositories</para> + <para role="tagline">使用远程仓库来安装Mageia的工具</para> <mediaobject> <imageobject> <imagedata fileref="../mageia-2013.png"/> diff --git a/docs/installer/hu.po b/docs/installer/hu.po index e4719882..0cf27cd5 100644 --- a/docs/installer/hu.po +++ b/docs/installer/hu.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" "POT-Creation-Date: 2017-06-25 20:39+0300\n" -"PO-Revision-Date: 2017-10-11 14:41+0000\n" -"Last-Translator: Balzamon\n" +"PO-Revision-Date: 2017-10-23 15:39+0000\n" +"Last-Translator: Kardos László <kardiweb@protonmail.ch>\n" "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/" "language/hu/)\n" "Language: hu\n" @@ -55,7 +55,7 @@ msgstr "Licencegyezmény" msgid "" "Before installing <application>Mageia</application>, please read the license " "terms and conditions carefully." -msgstr "Mielőtt telepítené a Mageiát kérem olvassa el a licenc feltételeket." +msgstr "Mielőtt telepítené a Mageiát kérjük olvassa el a licenc feltételeket." #. type: Content of: <section><section><para> #: en/acceptLicense.xml:46 @@ -64,7 +64,7 @@ msgid "" "application> distribution and must be accepted before you can continue." msgstr "" "A feltételek a <application>Mageia</application> rendszerre vonatkoznak " -"folytatás előtt fodadja el." +"folytatás előtt kattintson az alkalmaz gombra." #. type: Content of: <section><section><para> #: en/acceptLicense.xml:50 @@ -72,7 +72,7 @@ msgid "" "To accept, simply select <guilabel>Accept</guilabel> and then click on " "<guibutton>Next</guibutton>." msgstr "" -"Az elfogadáshoz vállasza az <guilabel>elfogadom</guilabel> lehetőséget és " +"Az elfogadáshoz válassza az <guilabel>elfogadom</guilabel> lehetőséget és " "kattintson a <guibutton>tovább</guibutton> gombra. " #. type: Content of: <section><section><para> diff --git a/docs/installer/hu/acceptLicense.xml b/docs/installer/hu/acceptLicense.xml index 4fc9484f..f0981c87 100644 --- a/docs/installer/hu/acceptLicense.xml +++ b/docs/installer/hu/acceptLicense.xml @@ -46,12 +46,12 @@ fileref="live-license.png"/> </imageobject></mediaobject> <title xml:id="license-ti1">Licencegyezmény</title> </info> - <para>Mielőtt telepítené a Mageiát kérem olvassa el a licenc feltételeket.</para> + <para>Mielőtt telepítené a Mageiát kérjük olvassa el a licenc feltételeket.</para> <para>A feltételek a <application>Mageia</application> rendszerre vonatkoznak -folytatás előtt fodadja el.</para> +folytatás előtt kattintson az alkalmaz gombra.</para> - <para>Az elfogadáshoz vállasza az <guilabel>elfogadom</guilabel> lehetőséget és + <para>Az elfogadáshoz válassza az <guilabel>elfogadom</guilabel> lehetőséget és kattintson a <guibutton>tovább</guibutton> gombra. </para> <para>Ha még is úgy dönt, hogy ezeket a feltételeket nem fogadja el akkor diff --git a/docs/mcc-help/zh_CN.po b/docs/mcc-help/zh_CN.po index c7e5b89c..b852a66c 100644 --- a/docs/mcc-help/zh_CN.po +++ b/docs/mcc-help/zh_CN.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2017-06-07 18:57+0300\n" -"PO-Revision-Date: 2017-05-07 09:40+0000\n" +"POT-Creation-Date: 2017-06-23 13:57+0300\n" +"PO-Revision-Date: 2017-10-22 13:56+0000\n" "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" "language/zh_CN/)\n" @@ -251,8 +251,8 @@ msgstr "" "框来提示您启动 Userdrake。该工具允许您指定可以哦嗯下目录的用户至 fileshare " "组:在用户选项卡中,先点击要添加到 fileshare 组的用户,然后点击用户组选项卡中" "的<guimenuitem>编辑</guimenuitem>,勾选 fileshare 组并点击<guibutton>确定</" -"guibutton>。有关 Userdrake 的更多信息,请见<xref linkend=\"userdrake\">" -"此页</xref>" +"guibutton>。有关 Userdrake 的更多信息,请见<xref linkend=\"userdrake\">此页</" +"xref>" #. type: Content of: <section><note><para> #: en/diskdrake--fileshare.xml:50 @@ -272,8 +272,8 @@ msgstr "" "功能仅被部分文件管理器支持。" #. type: Attribute 'xml:lang' of: <section> -#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 -#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1 +#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1 +#: en/software-management.xml:2 en/transfugdrake.xml:1 msgid "en" msgstr "zh_CN" @@ -970,6 +970,9 @@ msgid "" "password will be asked at the boot time to select a booting entry or change " "settings. The username is \"root\" and the password is the one chosen here." msgstr "" +"在第三个(也是最后一个)名为<guibutton>安全</guibutton>的区域中,您可以为引导" +"器设置密码。之后,在系统引导时就必须输入用户名和密码才能调整引导参数:用户名" +"默认为“root”,密码即为您在此处设置的密码。" #. type: Content of: <section><para> #: en/drakboot.xml:63 @@ -4789,7 +4792,7 @@ msgstr "draksambashare16.png" #. type: Content of: <section><section><para> #: en/draksambashare.xml:203 msgid "When the list has at least one entry, menu entries can be used." -msgstr "" +msgstr "当列表中至少有一项时,您可以使用菜单项来编辑它。" #. type: Content of: <section><section><formalpara><para> #: en/draksambashare.xml:209 @@ -7734,8 +7737,7 @@ msgstr "<xref linkend=\"drakconsole\"/>" #: en/mcc-system.xml:47 msgid "" "<xref linkend=\"userdrake\"/><emphasis> = Manage users on system</emphasis>" -msgstr "" -"<xref linkend=\"userdrake\"/><emphasis> = 管理系统中的用户</emphasis>" +msgstr "<xref linkend=\"userdrake\"/><emphasis> = 管理系统中的用户</emphasis>" #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para> #: en/mcc-system.xml:50 @@ -10613,20 +10615,3 @@ msgstr "" "在点击<guibutton>退出</guibutton>按钮后,系统会要求您确认。在此之前,您仍然有" "机会取消更改、保留之前的配置。如果您接受新配置,您必须注销后重新登录来应用新" "配置。" - -#~ msgid "<xref linkend=\"drakauth\"></xref>" -#~ msgstr "<xref linkend=\"drakauth\"></xref>" - -#~ msgid "<xref linkend=\"drakfont\"></xref>" -#~ msgstr "<xref linkend=\"drakfont\"></xref>" - -#~ msgid "<xref linkend=\"logdrake\"></xref>" -#~ msgstr "<xref linkend=\"logdrake\"></xref>" - -#~ msgid "<xref linkend=\"draksnapshot-config\"></xref>" -#~ msgstr "<xref linkend=\"draksnapshot-config\"></xref>" - -#~ msgid "" -#~ "In the third and last part, called <guibutton>Security</guibutton>, it is " -#~ "possible to set a password." -#~ msgstr "第三个区域是<guibutton>安全</guibutton>设置,用于设置密码。" diff --git a/docs/mcc-help/zh_CN/drakboot.xml b/docs/mcc-help/zh_CN/drakboot.xml index f7e2140c..45ac2467 100644 --- a/docs/mcc-help/zh_CN/drakboot.xml +++ b/docs/mcc-help/zh_CN/drakboot.xml @@ -38,10 +38,7 @@ LILO,使用图形或文本界面。这些选项提供的功能基本一致, <para>第二个区域是<guilabel>主要选项</guilabel>,您可以设置<guibutton>自动引导之前等待</guibutton>,时间的单位是秒。在倒计时时,GRUB 或 LILO 将显示可用的操作系统,提示您进行选择。若您没有做出选择,引导器将会自动引导默认操作系统。</para> - <para>In the third and last part, called <guibutton>Security</guibutton>, it is -possible to set a password for the bootloader. This means a username and -password will be asked at the boot time to select a booting entry or change -settings. The username is "root" and the password is the one chosen here.</para> + <para>在第三个(也是最后一个)名为<guibutton>安全</guibutton>的区域中,您可以为引导器设置密码。之后,在系统引导时就必须输入用户名和密码才能调整引导参数:用户名默认为“root”,密码即为您在此处设置的密码。</para> <para><guibutton>高级</guibutton>按钮用于设置额外参数。</para> diff --git a/docs/mcc-help/zh_CN/draksambashare.xml b/docs/mcc-help/zh_CN/draksambashare.xml index 4c66a516..28b3f903 100644 --- a/docs/mcc-help/zh_CN/draksambashare.xml +++ b/docs/mcc-help/zh_CN/draksambashare.xml @@ -173,7 +173,7 @@ Windows,并要求提供管理员用户的名称。之后的配置与独立服 <section> <title>菜单项</title> - <para>When the list has at least one entry, menu entries can be used.</para> + <para>当列表中至少有一项时,您可以使用菜单项来编辑它。</para> <formalpara> <title>文件|写入配置</title> |