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

[Landry Breuil]

Updating branch refs/heads/master
         to cea6e0144095224a6b739f59f7dd53aaccc2aef3 (commit)
       from 4ba9a2d625fdefcf8fdeb5d5e76290b14de8292b (commit)

commit cea6e0144095224a6b739f59f7dd53aaccc2aef3
Merge: 4ba9a2d 06af293
Author: Landry Breuil <landry at xfce.org>
Date:   Mon Apr 23 18:17:57 2012 +0200

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

commit 06af29341120647bb75d4be816a2adee98d1af69
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Fri Apr 20 12:45:40 2012 +0200

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

 po/zh_CN.po |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2766e4b..47d8ebf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,18 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-cpugraph-plugin\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 23:23+0200\n"
+"Report-Msgid-Bugs-To: <xfce-i18n at xfce.org>\n"
+"POT-Creation-Date: 2012-04-20 06:30+0000\n"
 "PO-Revision-Date: 2010-11-27 20:45+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
-"Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
+"Language-Team: Chinese (Simplified) <xfce-i18n-cn 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"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/cpu.c:303
+#: ../panel-plugin/cpu.c:332
 #, c-format
 msgid "Usage: %u%%"
 msgstr "使用率：%u%%"