[Xfce4-commits] <xfce4-systemload-plugin:master> Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-systemload-plugin

[Landry Breuil]

Updating branch refs/heads/master
         to 24923a178bdab38514b46ec1332c006288f2b912 (commit)
       from 1fe7afb32fe4381606badff1cec2351744808009 (commit)

commit 24923a178bdab38514b46ec1332c006288f2b912
Merge: 1fe7afb 583b6ad
Author: Landry Breuil <landry at xfce.org>
Date:   Wed Apr 18 18:36:50 2012 +0200

    Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-systemload-plugin

commit 583b6ad068c3a39128dc588054aef92438bf3b3a
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Wed Apr 18 18:19:33 2012 +0200

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 21 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 1df419b2ee1180778db2f14d312b5bae593804e1
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Wed Apr 18 18:14:48 2012 +0200

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 21 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 991d0c7..7c10506 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,19 +4,19 @@
 # the xfce4-systemload-plugin package.
 # Hunt Xu <huntxu at live.cn>, 2009.
 # Chipong Luo <chipong.luo at yahoo.com>, 2011, 2012.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-systemload-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 17:17+0200\n"
+"POT-Creation-Date: 2012-04-18 16:06+0000\n"
 "PO-Revision-Date: 2009-05-09 13:56+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../panel-plugin/cpu.c:63
@@ -48,19 +48,17 @@ msgstr "无交换分区"
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
-msgstr[1] "%d 天"
 
 #: ../panel-plugin/systemload.c:186
 #, c-format
 msgid "Uptime: %d day %d:%02d"
 msgid_plural "Uptime: %d days %d:%02d"
 msgstr[0] "运行时间：%d 天 %d：%02d"
-msgstr[1] "运行时间：%d 天 %d：%02d"
 
 #: ../panel-plugin/systemload.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "Uptime: %d:%02d"
-msgstr "运行时间：%d 天 %d：%02d"
+msgstr "运行时间：%d：%02d"
 
 #: ../panel-plugin/systemload.c:811
 msgid "CPU monitor"
@@ -78,7 +76,7 @@ msgstr "交换分区监视器"
 msgid "Uptime monitor"
 msgstr "Uptime 监视器"
 
-#: ../panel-plugin/systemload.c:819 ../panel-plugin/systemload.desktop.in.h:1
+#: ../panel-plugin/systemload.c:819 ../panel-plugin/systemload.desktop.in.h:2
 msgid "System Load Monitor"
 msgstr "系统负载监视器"
 
@@ -110,6 +108,6 @@ msgstr "监视条颜色："
 msgid "File /proc/uptime not found!"
 msgstr "文件 /proc/uptime 未找到！"
 
-#: ../panel-plugin/systemload.desktop.in.h:2
+#: ../panel-plugin/systemload.desktop.in.h:1
 msgid "Monitor CPU load, swap usage and memory footprint"
 msgstr "监视 CPU 负载、交换分区用量和内存使用踪迹"