summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2019-01-22 08:23:38 +0000
committerJulian Andres Klode <jak@debian.org>2019-01-22 08:23:38 +0000
commit1351fb372ae01453166682e8e12484b2e02c759b (patch)
treee21b67255fd0bc6271678382a47b19440a05be39
parentfb1c5167f1a69fc47ca8e741b86fab1ae7c08309 (diff)
parent7dc913f3221a99f83602150f1dc06ed0bf4fc6d4 (diff)
Merge branch 'master' into 'master'
zh_CN.po: Update Simplified Chinese programs translation. See merge request apt-team/apt!43
-rw-r--r--po/zh_CN.po21
1 files changed, 8 insertions, 13 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e40abfac2..8a935332c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Mo Zhou <cdluminate@gmail.com>, 2014, 2015, 2016, 2017.
+# Mo Zhou <cdluminate@gmail.com>, 2014, 2015, 2016, 2017, 2019.
# Boyuan Yang <073plan@gmail.com>, 2018.
#
msgid ""
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: apt 1.7.x\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2018-12-18 15:02+0100\n"
-"PO-Revision-Date: 2018-07-13 18:16+0800\n"
+"PO-Revision-Date: 2019-01-12 00:00+0000\n"
"Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -1080,19 +1080,15 @@ msgid "Unable to parse package file %s (%d)"
msgstr "无法解析软件包文件 %s (%d)"
#: apt-pkg/deb/debsystem.cc
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to lock the administration directory (%s), is another process "
-#| "using it?"
+#, c-format
msgid ""
"Unable to acquire the dpkg frontend lock (%s), is another process using it?"
-msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?"
+msgstr "无法获取 dpkg 前端锁 (%s),是否有其他进程正占用它?"
#: apt-pkg/deb/debsystem.cc
-#, fuzzy, c-format
-#| msgid "Unable to lock the administration directory (%s), are you root?"
+#, c-format
msgid "Unable to acquire the dpkg frontend lock (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?"
+msgstr "无法获取 dpkg 前端锁 (%s),请查看您是否正以 root 用户运行?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -2444,10 +2440,9 @@ msgid "Failed to parse %s. Edit again? "
msgstr "解析 %s 失败。请重新编辑之后再试。"
#: apt-private/private-sources.cc
-#, fuzzy, c-format
-#| msgid "Your '%s' file changed, please run 'apt-get update'."
+#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'.\n"
-msgstr "您的 %s 文件有过改动,请执行 ‘apt-get update’。"
+msgstr "您的 %s 文件有过改动,请执行 ‘apt-get update’。\n"
#: apt-private/private-unmet.cc
#, c-format