diff options
| author | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
| commit | 3784e34677882fbea8538baa1c25b0d35abf429a (patch) | |
| tree | 2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /po/zh_CN.po | |
| parent | 8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff) | |
| parent | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff) | |
Merge with Michael and resolve conflicts
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index f887f3328..789101a74 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-22 14:20+1300\n" "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -2258,15 +2258,15 @@ msgstr "可选" msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "生成依赖关系" |