diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-04-21 13:28:01 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-04-21 13:28:01 +0000 |
| commit | 3c35cc8951f384fe83dd276790c99a6a0b9a8f51 (patch) | |
| tree | 6a2101526bcf3e69baba9144da83651aa0469a48 /po/zh_CN.po | |
| parent | aedbe86350d40f99eab4c18764917556940d5f3a (diff) | |
| download | urpmi-3c35cc8951f384fe83dd276790c99a6a0b9a8f51.tar urpmi-3c35cc8951f384fe83dd276790c99a6a0b9a8f51.tar.gz urpmi-3c35cc8951f384fe83dd276790c99a6a0b9a8f51.tar.bz2 urpmi-3c35cc8951f384fe83dd276790c99a6a0b9a8f51.tar.xz urpmi-3c35cc8951f384fe83dd276790c99a6a0b9a8f51.zip | |
Merge strings
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index afdd7d45..e434f95c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: urpmi 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-04-21 14:52+0200\n" +"POT-Creation-Date: 2005-04-21 15:09+0200\n" "PO-Revision-Date: 2005-01-31 23:45+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n" "Language-Team: Mandrakelinux Simplified Chinese <cooker-i18n@linux-mandrake." @@ -1414,7 +1414,7 @@ msgstr " --no-uninstall - 从不询问卸载软件包，直接中断安装。\n msgid " --no-install - don't install packages (only download)\n" msgstr " --install-src - 只安装源代码包(无二进制文件)。\n" -#: ../urpmi:88 +#: ../urpmi:88 ../urpmq:52 #, c-format msgid "" " --keep - keep existing packages if possible, reject requested\n" @@ -2064,14 +2064,6 @@ msgstr "" "\n" "用法:\n" -#: ../urpmq:52 -#, fuzzy, c-format -msgid "" -" --keep - keep existing packages if possible, reject requested\n" -" packages that leads to remove.\n" -msgstr "" -" --keep - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n" - #: ../urpmq:54 #, c-format msgid " --list - list available packages.\n" @@ -2214,6 +2206,13 @@ msgstr "没有找到文件列表\n" msgid "No changelog found\n" msgstr "没有找到更新日志\n" +#, fuzzy +#~ msgid "" +#~ " --keep - keep existing packages if possible, reject requested\n" +#~ " packages that leads to remove.\n" +#~ msgstr "" +#~ " --keep - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n" + #~ msgid "unable to write file [%s]" #~ msgstr "无法写入文件[%s]" |