* merged with bubulle

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-132
   Completed Simplified Chinese translation

diff --git a/debian/changelog b/debian/changelog
index 7399b695e7ff602a53c4cbf7cb08c42c172dcd51..c7e2fea583af17ea5d69d4834c078cccdd440893 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 apt (0.6.42.4) unstable; urgency=low
 
-  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:  
-    * zh_CN.po: Completed to 507 strings(Closes: #338267)
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
+    * zh_CN.po: Completed to 510 strings(Closes: #338267)
     * gl.po: Completed to 510 strings (Closes: #338356)
   * added support for "/etc/apt/sources.list.d" directory 
     (closes: #66325)

diff --git a/po/ChangeLog b/po/ChangeLog
index 52086113db9521dc28be736476c7e27864ff3232..830f746eb90b63bf56aea19d9a5ba53edd6c793d 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14   Kov Tchai  <tchaikov@sjtu.edu.cn>
+
+       * zh_CN.po: Completed to 510 strings
+                Definitely Closes: #338267
+
 2005-11-13   Kov Tchai  <tchaikov@sjtu.edu.cn>
 
        * zh_CN.po: Completed to 507 strings

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f2be979dbad61adf2c04f2952023c7cf9519800..606b95cb537a2b335054111e4be0ef86c3a88ea8 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-25 18:41+0200\n"
-"PO-Revision-Date: 2005-10-29 10:08+0800\n"
+"PO-Revision-Date: 2005-11-15 00:05+0800\n"
 "Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -229,16 +229,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+msgstr "请把光盘碟片插入驱动器再按回车键"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -985,7 +984,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1405
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，AllUpgrade 坏事了"
 
 #: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
 #, c-format
@@ -1031,7 +1030,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1585
 msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对问题的解决有所帮助："
+msgstr "下列的信息可能会对解决问题有所帮助："
 
 #: cmdline/apt-get.cc:1588
 msgid "Broken packages"
@@ -1039,7 +1038,7 @@ msgstr "无法安装的软件包"
 
 #: cmdline/apt-get.cc:1614
 msgid "The following extra packages will be installed:"
-msgstr "将会安装下列的额外的软件包："
+msgstr "将会安装下列额外的软件包："
 
 #: cmdline/apt-get.cc:1685
 msgid "Suggested packages:"