Author: keichwa
Date: 2016-09-22 14:44:57 +0200 (Thu, 22 Sep 2016)
New Revision: 97080
Modified:
branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po
branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po
branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po
branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po
branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po
Log:
merged
Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po
===================================================================
--- branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po 2016-09-22 12:44:11 UTC (rev 97079)
+++ branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po 2016-09-22 12:44:57 UTC (rev 97080)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-09-12 09:12+0200\n"
"PO-Revision-Date: 2016-06-05 23:29+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
@@ -39,30 +39,23 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enough "
-"to enter server's URL and the paths\n"
-" to repositories will be filled automatically.</p>It is also "
-"possible to use custom paths. Some examples of how the URL could look like:\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough to enter server's URL and the paths\n"
+" to repositories will be filled automatically.</p>It is also possible to use custom paths. Some examples of how the URL could look like:\n"
"</p><p>\n"
"<ul>\n"
-"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/"
-"product</i> for SMT server\n"
-"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/"
-"sles11-sp3-x86_64/</i> for SUSE Manager Server.\n"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
+"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
"</p>"
msgstr ""
"<p>在这里您可以编辑您<b>更新软件源</b>的位置。</p>\n"
"<p>\n"
-"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上，输入服务器 URL 就够了，软"
-"件源路径将自动填充。</p>也可以使用自定义路径。一些 URL 示例：\n"
+"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上，输入服务器 URL 就够了，软件源路径将自动填充。</p>也可以使用自定义路径。一些 URL 示例：\n"
"</p><p>\n"
"<ul>\n"
-"<li>SMT 服务器：<i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/"
-"product</i>\n"
-"<li>SUSE Manager 服务器：<i>http://manager.example.com/ks/dist/child/suse-"
-"cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i>\n"
+"<li>SMT 服务器：<i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i>\n"
+"<li>SUSE Manager 服务器：<i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i>\n"
"</p><p>\n"
"详细描述请查阅部署指南。\n"
"</p>"
@@ -85,10 +78,8 @@
#. help text for the Network mode tab (do not translate bastion)
#: src/include/crowbar/complex.rb:196
msgid ""
-"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.\n"
-"<p>You can also specify interface names for the bastion network conduits as "
-"space-separated list.</p>"
+"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n"
+"<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>"
msgstr ""
"<p>在这里定义一个<b>网络模式及相关的<b>绑定策略</b>。</p>\n"
"<p>您也可以空格分隔列表指定堡垒网络管道的接口名称。</p>"
@@ -394,8 +385,7 @@
#. label (hint for user)
#: src/include/crowbar/complex.rb:1502
-msgid ""
-"If no user is present, user 'crowbar' with default password will be used."
+msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr "若没有用户则将使用 'crowbar' 用户和默认密码。"
#. tab header
Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po
===================================================================
--- branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po 2016-09-22 12:44:11 UTC (rev 97079)
+++ branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po 2016-09-22 12:44:57 UTC (rev 97080)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"POT-Creation-Date: 2016-09-12 09:12+0200\n"
"PO-Revision-Date: 2016-01-17 14:12+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po
===================================================================
--- branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po 2016-09-22 12:44:11 UTC (rev 97079)
+++ branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po 2016-09-22 12:44:57 UTC (rev 97080)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-02-03 19:36+0800\n"
"Last-Translator: 玛格丽特 · 苏 \n"
"Language-Team: Chinese Simplified \n"
@@ -123,8 +123,7 @@
#: src/clients/inst_live_simple_proposal.rb:160
msgid ""
"<p>\n"
-"Use <b>Accept</b> to perform a new installation with the values displayed."
+"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
msgstr ""
"<p>\n"
"用<b>接受</b>来用显示的值执行全新安装。</p>"
Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po
===================================================================
--- branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po 2016-09-22 12:44:11 UTC (rev 97079)
+++ branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po 2016-09-22 12:44:57 UTC (rev 97080)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-09-12 09:13+0200\n"
"PO-Revision-Date: 2014-06-10 10:37+0800\n"
"Last-Translator: 玛格丽特 · 苏 \n"
"Language-Team: Chinese Traditional \n"
Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po
===================================================================
--- branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2016-09-22 12:44:11 UTC (rev 97079)
+++ branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2016-09-22 12:44:57 UTC (rev 97080)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-09-12 09:13+0200\n"
"PO-Revision-Date: 2014-06-08 11:02+0800\n"
"Last-Translator: 玛格丽特 · 苏 \n"
"Language-Team: Chinese Simplified \n"
