[yum-commits] Branch 'yum-3_2_X' - 2 commits - po/zh_CN.po

[skvidal at osuosl.org]

 po/zh_CN.po |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0ead4fdd523fa67b5cf23e59cf8fd2ba1c3ac697
Merge: ac0a066... 005aceb...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Oct 13 17:32:48 2009 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Comment/log message/doc spelling fixes.

commit ac0a066d9e06060be3a69b42f7cb8a7c6e6e06c6
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Oct 13 17:02:13 2009 -0400

    - get rid of one translation until we can get a proper fix for reordering the arguments
    - add a %s to the end of another to get rid of msgfmt -c complaining about .

diff --git a/po/zh_CN.po b/po/zh_CN.po
index de1cd00..87974bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -121,10 +121,9 @@ msgstr "ä½ éœ€è¦ç»™å‡ºå‘½ä»¤"
 msgid "Disk Requirements:\n"
 msgstr "磁盘要求：\n"
 
-#: ../cli.py:313
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
-msgstr "在 %s 文件系统中仍需要%dMB 空间。\n"
+msgstr "  At least %dMB needed on the %s filesystem.\n"
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
@@ -2084,7 +2083,7 @@ msgstr "%d %s æ–‡ä»¶å·²åˆ é™¤"
 #: ../yum/__init__.py:1779
 #, python-format
 msgid "More than one identical match in sack for %s"
-msgstr "群集中有超过一个相同的匹配"
+msgstr "群集中有超过一个相同的匹配 %s"
 
 #: ../yum/__init__.py:1785
 #, python-format