diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /po/zh_CN.po | |
parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 1c52d991e..0c7f88d90 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3387,6 +3387,14 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#, fuzzy +#~ msgid "System error resolving '%s:%s'" +#~ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)" + +#, fuzzy +#~ msgid "%c%s... %u%%" +#~ msgstr "%c%s... 完成" + #~ msgid "Skipping nonexistent file %s" #~ msgstr "跳过不存在的文件 %s" |