diff options
| author | Daniel Burrows <dburrows@debian.org> | 2008-01-16 21:01:29 -0800 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2008-01-16 21:01:29 -0800 |
| commit | 8c171bd379011e819ce0466495ad62d3b2cfa3bb (patch) | |
| tree | 64e20cb6dea885c7b13159f0d0cf093949142532 /po/zh_CN.po | |
| parent | 4bb820edd377c6193eadcc558ef6f2d09f5da6e5 (diff) | |
| parent | 99008ed6fca9d0d0d3018283a348e1fcbf1151ea (diff) | |
| download | aptitude-8c171bd379011e819ce0466495ad62d3b2cfa3bb.tar.gz | |
Automated merge with http://hg.debian.org/hg/aptitude/head
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 9c257882..7d5d4851 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -425,7 +425,7 @@ msgstr "安装或者卸载时自动修正破损的软件包" msgid "" "If this option is enabled, and you perform an install run while some " "packages are broken, aptitude will automatically apply the current " -"suggestion of the problem resolver. Otherwise,aptitude will prompt you for " +"suggestion of the problem resolver. Otherwise, aptitude will prompt you for " "a solution to the broken dependencies." msgstr "" "如果开启此选项，并且您在有些软件包被破坏的时候执行安装， aptitude 会自动使用" @@ -438,8 +438,8 @@ msgstr "自动安装推荐软件包" #: src/apt_options.cc:353 #, fuzzy msgid "" -"If this option is enabled and \"automatically resolve dependencies\" is " -"also enabled, aptitude will attempt to install the recommendations of newly " +"If this option is enabled and \"automatically resolve dependencies\" is also " +"enabled, aptitude will attempt to install the recommendations of newly " "installed packages in addition to their outright dependencies. Suggestions " "will not be automatically installed.\n" "If this option is enabled and \"Remove unused packages automatically\" is " @@ -1920,7 +1920,7 @@ msgid " ++ --> ENQUEUING\n" msgstr " ++ --> 加入队列\n" #: src/cmdline/cmdline_why.cc:673 -msgid " ++ --> skipping, version check failed.\n" +msgid " ++ --> skipping, version check failed\n" msgstr " ++ --> 跳过，版本检查失败。\n" #: src/cmdline/cmdline_why.cc:691 @@ -4317,7 +4317,7 @@ msgstr "" msgid "License" msgstr "许可证" -#: src/ui.cc:1019 +#: src/ui.cc:1019 src/ui.cc:2351 msgid "View the terms under which you may copy and distribute aptitude" msgstr "查看您可以在何种条款下拷贝和分发 aptitude" @@ -5021,10 +5021,6 @@ msgstr "新闻(^N)" msgid "^License" msgstr "许可证(^L)" -#: src/ui.cc:2351 -msgid "View the terms under which you may copy and distribute aptiutde" -msgstr "查看您可以在何种条款下拷贝和分发 aptitude" - #: src/ui.cc:2491 msgid "Actions" msgstr "动作" |