merge, upd fr

1 files changed, 27 insertions, 27 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 15107dc9..798ffb64 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-06 13:44+0200\n"
+"POT-Creation-Date: 2002-08-06 15:03+0200\n"
 "PO-Revision-Date: 2001-09-27 11:30+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
@@ -26,7 +26,7 @@ msgstr "无法创建报告文件， 中止.\n"
 msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54 ../edit-urpm-sources.pl_.c:163
+#: ../edit-urpm-sources.pl_.c:54 ../edit-urpm-sources.pl_.c:165
 #, fuzzy
 msgid "Edit a source"
 msgstr "编辑源介质"
@@ -46,7 +46,7 @@ msgid "FTP server"
 msgstr ""
 
 #: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:169
+#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:171
 msgid "URL:"
 msgstr "URL:"
 
@@ -91,13 +91,13 @@ msgstr "口令"
 msgid "Name:"
 msgstr "名称"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:170
+#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:172
 #, fuzzy
 msgid "Relative path to synthesis/hdlist:"
 msgstr "对hdlist的相对路径: "
 
 #: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up all the entries."
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl_.c:111
@@ -122,95 +122,95 @@ msgstr "介质类型:"
 msgid "Ok"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:174
-#: ../edit-urpm-sources.pl_.c:199 ../rpmdrake.pm_.c:260 ../rpmdrake_.c:622
+#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:176
+#: ../edit-urpm-sources.pl_.c:200 ../rpmdrake.pm_.c:260 ../rpmdrake_.c:622
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl_.c:144
+#: ../edit-urpm-sources.pl_.c:145
 #, fuzzy
 msgid "Please wait, adding medium..."
 msgstr "查找依赖性..."
 
-#: ../edit-urpm-sources.pl_.c:152
+#: ../edit-urpm-sources.pl_.c:154
 #, fuzzy
 msgid "Please wait, removing medium..."
 msgstr "查找依赖性..."
 
-#: ../edit-urpm-sources.pl_.c:167
+#: ../edit-urpm-sources.pl_.c:169
 #, fuzzy, c-format
 msgid "Editing source \"%s\":"
 msgstr "编辑源介质"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../edit-urpm-sources.pl_.c:175
 #, fuzzy
 msgid "Save changes"
 msgstr "软件包:"
 
-#: ../edit-urpm-sources.pl_.c:183
+#: ../edit-urpm-sources.pl_.c:185
 #, fuzzy
 msgid "Please wait, updating medium..."
 msgstr "查找依赖性..."
 
-#: ../edit-urpm-sources.pl_.c:191
+#: ../edit-urpm-sources.pl_.c:192
 #, fuzzy
 msgid "Update source(s)"
 msgstr "编辑源介质"
 
-#: ../edit-urpm-sources.pl_.c:194
+#: ../edit-urpm-sources.pl_.c:195
 #, fuzzy
 msgid "Select the source(s) you wish to update:"
 msgstr "选择要升级的软件包的源介质:"
 
-#: ../edit-urpm-sources.pl_.c:198
+#: ../edit-urpm-sources.pl_.c:199
 #, fuzzy
 msgid "Update"
 msgstr "仅仅升级"
 
-#: ../edit-urpm-sources.pl_.c:206
+#: ../edit-urpm-sources.pl_.c:207
 #, fuzzy
 msgid "Please wait, updating media..."
 msgstr "查找依赖性..."
 
-#: ../edit-urpm-sources.pl_.c:213
+#: ../edit-urpm-sources.pl_.c:214
 #, fuzzy
 msgid "Configure sources"
 msgstr "配置源?"
 
-#: ../edit-urpm-sources.pl_.c:214
+#: ../edit-urpm-sources.pl_.c:215
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:214
+#: ../edit-urpm-sources.pl_.c:215
 msgid "Source"
 msgstr "源"
 
-#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:482
+#: ../edit-urpm-sources.pl_.c:243 ../rpmdrake_.c:482
 #, fuzzy
 msgid "Remove"
 msgstr "可卸装"
 
-#: ../edit-urpm-sources.pl_.c:244
+#: ../edit-urpm-sources.pl_.c:245
 msgid "Edit"
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl_.c:246
+#: ../edit-urpm-sources.pl_.c:247
 msgid "Add..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:248
+#: ../edit-urpm-sources.pl_.c:249
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:252
 msgid "Save and quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:486
+#: ../edit-urpm-sources.pl_.c:253 ../rpmdrake_.c:486
 msgid "Quit"
 msgstr "退出"
 
-#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:708
+#: ../edit-urpm-sources.pl_.c:263 ../rpmdrake_.c:708
 #, c-format
 msgid ""
 "%s\n"
@@ -218,7 +218,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:265
+#: ../edit-urpm-sources.pl_.c:266
 msgid ""
 "Welcome to the packages source editor!\n"
 "\n"