Merge branch 'maint'

2 files changed, 6 insertions, 6 deletions

diff --git a/po/el.po b/po/el.po
index 26a4e0d9..c4a057ed 100644
--- a/po/el.po
+++ b/po/el.po
@@ -965,15 +965,15 @@ msgstr "Προαιρετικές εξαρτήσεις για το  %s\n"
 
 #, c-format
 msgid "[Y/n]"
-msgstr "[Y-ΝΑΙ/n-όχι]"
+msgstr "[Y/n]"
 
 #, c-format
 msgid "[y/N]"
-msgstr "[y-ναι/N-ΟΧΙ]"
+msgstr "[y/N]"
 
 #, c-format
 msgid "Y"
-msgstr "Y-ΝΑΙ"
+msgstr "Y"
 
 #, c-format
 msgid "YES"
@@ -981,7 +981,7 @@ msgstr "ΝΑΙ"
 
 #, c-format
 msgid "N"
-msgstr "N-ΟΧΙ"
+msgstr "N"
 
 #, c-format
 msgid "NO"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4a60ae76..5f64e23f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-08 20:46+0700\n"
+"PO-Revision-Date: 2009-10-18 23:53+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -1075,7 +1075,7 @@ msgid "Unable to find source file %s for extraction."
 msgstr "无法找到源代码文件 %s 进行解压缩。"
 
 msgid "Extracting %s with %s"
-msgstr "正在使用 %2$s 解压缩 %1$s"
+msgstr "正在解压缩 %s，使用 %s"
 
 msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"