diff options
author | Allan McRae <allan@archlinux.org> | 2015-02-20 01:36:18 +0100 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2015-02-20 01:36:18 +0100 |
commit | 7879a5b3e5c66d31b9375242f026a40464a6b34f (patch) | |
tree | a4623b9213a02d88e8142c16829cec4251df6b38 /src/pacman/po/zh_CN.po | |
parent | adc6ca1f2c08bb01a29f5247bfa5ee3bd30ee727 (diff) | |
parent | 068f8cec42057751f528b19cece37db13ae92541 (diff) | |
download | pacman-7879a5b3e5c66d31b9375242f026a40464a6b34f.tar.gz pacman-7879a5b3e5c66d31b9375242f026a40464a6b34f.tar.xz |
Merge branch 'maint'
Diffstat (limited to 'src/pacman/po/zh_CN.po')
-rw-r--r-- | src/pacman/po/zh_CN.po | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/pacman/po/zh_CN.po b/src/pacman/po/zh_CN.po index 29a15c74..a09eb39e 100644 --- a/src/pacman/po/zh_CN.po +++ b/src/pacman/po/zh_CN.po @@ -6,9 +6,10 @@ # Allan McRae <allan@archlinux.org>, 2014 # Blask <blaskyy@gmail.com>, 2013 # Blask <blaskyy@gmail.com>, 2013 +# Felix Yan <felixonmars@gmail.com>, 2015 # leonfeng <chaofeng111@gmail.com>, 2011,2013 # leonfeng <chaofeng111@gmail.com>, 2011,2013 -# mytbk <mytbk920423@gmail.com>, 2013-2014 +# mytbk <mytbk920423@gmail.com>, 2013-2015 # mytbk <mytbk920423@gmail.com>, 2013 # leonfeng <chaofeng111@gmail.com>, 2013 # leonfeng <chaofeng111@gmail.com>, 2011 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2014-12-19 13:29+1000\n" -"PO-Revision-Date: 2014-11-27 02:00+0000\n" -"Last-Translator: Allan McRae <allan@archlinux.org>\n" +"PO-Revision-Date: 2015-02-09 06:33+0000\n" +"Last-Translator: Felix Yan <felixonmars@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/" "archlinux-pacman/language/zh_CN/)\n" "Language: zh_CN\n" @@ -138,7 +139,7 @@ msgstr "%s可选依赖%s\n" #: src/pacman/callback.c:289 src/pacman/callback.c:295 #, c-format msgid "%s installed as %s.pacnew\n" -msgstr "%s 已被安装为 %s.pacorig\n" +msgstr "%s 已被安装为 %s.pacnew\n" #: src/pacman/callback.c:305 src/pacman/callback.c:311 #, c-format @@ -431,7 +432,7 @@ msgstr "没有配置 '%s' \n" #: src/pacman/conf.c:757 #, c-format msgid "Failed to pass assume installed entry to libalpm" -msgstr "" +msgstr "传递假设安装条目至libalpm失败" #: src/pacman/conf.c:803 #, c-format @@ -853,6 +854,8 @@ msgid "" " -t, --unrequired list packages not (optionally) required by any\n" " package (-tt to ignore optdepends) [filter]\n" msgstr "" +" -t, --unrequired 列出不被任何软件包(可选)要求的软件包(-tt 忽略可选依" +"赖) [过滤器]\n" #: src/pacman/pacman.c:151 #, c-format @@ -969,6 +972,8 @@ msgid "" " --assume-installed <package=version>\n" " add a virtual package to satisfy dependencies\n" msgstr "" +"--assume-installed <package=version>\n" +"添加一个虚拟包用于满足依赖\n" #: src/pacman/pacman.c:190 #, c-format |