diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 6f90c20d..59167b21 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpmdrake 1.3\n" -"POT-Creation-Date: 2003-05-30 13:33+0200\n" +"POT-Creation-Date: 2003-06-13 21:08+0200\n" "PO-Revision-Date: 2003-05-24 11:13+0800\n" "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n" "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n" @@ -557,11 +557,6 @@ msgstr "摘要：" #: ../rpmdrake:1 #, c-format -msgid "%s conflicts with %s" -msgstr "%s 与 %s 相冲突" - -#: ../rpmdrake:1 -#, c-format msgid "System/Fonts/Type1" msgstr "" @@ -590,21 +585,6 @@ msgstr "重要性：" msgid "Unable to create medium." msgstr "无法创建来源。" -#: ../rpmdrake:1 -#, c-format -msgid "" -"The following packages have to be removed for others to be upgraded:\n" -"\n" -"%s\n" -"\n" -"Is it ok to continue?" -msgstr "" -"要升级其它软件包，必须删除下列软件包：\n" -"\n" -"%s\n" -"\n" -"确定继续吗？" - #: ../edit-urpm-sources.pl:1 #, fuzzy, c-format msgid "" @@ -649,11 +629,6 @@ msgstr "所有软件包都已成功安装" msgid "Add a parallel group" msgstr "" -#: ../rpmdrake:1 -#, c-format -msgid "unknown package " -msgstr "未知软件包" - #: ../rpmdrake:1 ../rpmdrake.pm:1 #, fuzzy, c-format msgid "Update media" @@ -1020,6 +995,23 @@ msgid "Removable device" msgstr "可移动设备" #: ../rpmdrake:1 +#, fuzzy, c-format +msgid "" +"The following packages have to be removed for others to be upgraded:\n" +"\n" +"%s\n" +"\n" +"(waiting for urpmi subroutine for explanation)\n" +"\n" +"Is it ok to continue?" +msgstr "" +"要升级其它软件包，必须删除下列软件包：\n" +"\n" +"%s\n" +"\n" +"确定继续吗？" + +#: ../rpmdrake:1 #, c-format msgid "Graphical desktop/Icewm" msgstr "" @@ -1194,12 +1186,12 @@ msgstr "在删除过程中发生问题" #: ../rpmdrake:1 #, c-format -msgid "Help launched in background" +msgid "Graphical desktop/Enlightenment" msgstr "" #: ../rpmdrake:1 #, c-format -msgid "Graphical desktop/Enlightenment" +msgid "Help launched in background" msgstr "" #: ../rpmdrake:1 @@ -1480,15 +1472,6 @@ msgid "Development/KDE and Qt" msgstr "" #: ../rpmdrake:1 -#, fuzzy, c-format -msgid "" -"Installation failed, some files are missing.\n" -"You may want to update your media database." -msgstr "" -"安装失败，缺少某些文件。\n" -"您可能需要更新您的软件源数据库。" - -#: ../rpmdrake:1 #, c-format msgid "Books/Howtos" msgstr "" @@ -1644,6 +1627,17 @@ msgid "System/Base" msgstr "" #: ../rpmdrake:1 +#, fuzzy, c-format +msgid "" +"Installation failed, some files are missing:\n" +"%s\n" +"\n" +"You may want to update your media database." +msgstr "" +"安装失败，缺少某些文件。\n" +"您可能需要更新您的软件源数据库。" + +#: ../rpmdrake:1 #, c-format msgid "" "Removing these packages would break your system, sorry:\n" @@ -2112,6 +2106,12 @@ msgstr "删除软件" msgid "Software Sources Manager" msgstr "软件源管理器" +#~ msgid "%s conflicts with %s" +#~ msgstr "%s 与 %s 相冲突" + +#~ msgid "unknown package " +#~ msgstr "未知软件包" + #, fuzzy #~ msgid "Update source" #~ msgstr "更新来源" |