[dasher/gnome-2-30] Merge Simplified Chinese translation from master.

[Aron Xu <aronxu src gnome org>]

commit f9ad3e1be370efd382a7172d4f8dc39abd219fe1
Author: Aron Xu <aronxu gnome org>
Date:   Sun Sep 5 03:46:01 2010 +0800

    Merge Simplified Chinese translation from master.

 po/zh_CN.po |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95268f4..7469a7e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,11 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dasher\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dasher&component=general\n"
-"POT-Creation-Date: 2010-01-29 11:43+0000\n"
-"PO-Revision-Date: 2010-02-04 17:14+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-05 03:45+0800\n"
+"PO-Revision-Date: 2010-08-04 16:57+0800\n"
+"Last-Translator: lainme <lainme993 gmail com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -577,9 +576,8 @@ msgstr "��空�"
 #. * ratio = exp(r/128) used in the design document
 #.
 #: ../Src/DasherCore/ButtonMode.cpp:37
-#, fuzzy
 msgid "Box non-uniformity"
-msgstr "ç??å­?å·®è·?"
+msgstr "æ¡?ä½?é??ä¸?è?´æ?§"
 
 #: ../Src/DasherCore/ClickFilter.cpp:9
 msgid "Maximum Zoom"
@@ -617,7 +615,6 @@ msgid "Direct Mode"
 msgstr "��模�"
 
 #: ../Src/DasherCore/DasherInterfaceBase.cpp:931
-#, fuzzy
 msgid "Stylus Control"
 msgstr "æ??é??æ?§å?¶"
 
@@ -673,7 +670,7 @@ msgstr "ç?¨æ?¥è¡¨ç¤ºè?ªå?¨å¢?é?¿é??度ç??ç­?å¾?æ?¶é?´(ç§?)"
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:48
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:42
 msgid "Percentage by which to decrease speed upon reverse"
-msgstr ""
+msgstr "å?¨å??æ?¹å??å??é??ç??ç?¾å??æ¯?"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:44
 msgid "One Button Dynamic Mode"
@@ -691,7 +688,7 @@ msgstr "æ?¾å¤§ç??å??æ?°"
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:45
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:43
 msgid "Lag before user actually pushes button (ms)"
-msgstr ""
+msgstr "å?¨ç?¨æ?·å®?é??æ??é?®ä¹?å??延è¿?æ?¶é?´(毫ç§?)"
 
 #. COneDimensionalFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, CDasherModel *m_pDasherModel);
 #: ../Src/DasherCore/OneDimensionalFilter.h:12
@@ -790,7 +787,7 @@ msgstr "翻转å??ä¸?å??å??ä¸?æ??é?®"
 #. button once; in this case, one must push three times (or push-and-hold) to reverse.
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:42
 msgid "Double-click is opposite up/down â?? triple to reverse"
-msgstr ""
+msgstr "å??å?»ç?¸å??å??ä¸?/å??ä¸?ï¼?è¿?å?»ä¸?ä¸?å??å??"
 
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:52
 msgid "Two Button Dynamic Mode"
@@ -798,21 +795,21 @@ msgstr "两æ??é?®å?¨æ??模å¼?"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:30
 msgid "Offset for outer (second) button"
-msgstr ""
+msgstr "å¤?é?¨(第äº?个)æ??é?®ç??ä½?移"
 
 #. divisor
 #. step
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:31
 msgid "Distance for 1st button UP"
-msgstr ""
+msgstr "第ä¸?个æ??é?®â??ä¸?â??ç??è·?离"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:32
 msgid "Distance for 1st button DOWN"
-msgstr ""
+msgstr "第ä¸?个æ??é?®â??ä¸?â??ç??è·?离"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:33
 msgid "Tolerance for inaccurate timing of button pushes (in ms)"
-msgstr ""
+msgstr "对æ??é?®æ?¶é?´ä¸?精确ç??容å¿?ç¨?度(毫ç§?)"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:39
 msgid "Slow startup time"
@@ -820,7 +817,7 @@ msgstr "å??æ?¢å?¯å?¨æ?¶é?´"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:47
 msgid "Two-push Dynamic Mode (New One Button)"
-msgstr ""
+msgstr "æ??两ä¸?å?¨æ??模å¼?(æ?°ç??ä¸?é?®å??è?½)"
 
 #: ../Src/Gtk2/DasherAppSettings.cpp:554
 msgid "Boolean parameters"
@@ -860,7 +857,7 @@ msgstr "��模�"
 #. TRANSLATORS: Automatically perform the selected action when Dasher is stopped.
 #: ../Src/Gtk2/Preferences.cpp:1026
 msgid "Auto On Stop"
-msgstr ""
+msgstr "è?ªå?¨å??æ­¢"
 
 #: ../Src/Gtk2/dasher_action_keyboard.cpp:62
 #: ../Src/Gtk2/dasher_action_keyboard_maemo.cpp:96
@@ -1009,7 +1006,7 @@ msgstr "æ??è¿° â??--optionsâ??ã??"
 #. Note to translators: This is the "--help" description of dasher.
 #: ../Src/main.cc:182
 msgid "- A text input application honouring accessibility"
-msgstr ""
+msgstr "- ä¸?个è?´å??äº?帮å?©æ®?é??人士è¿?è¡?æ??å­?è¾?å?¥ç??åº?ç?¨ç¨?åº?"
 
 #~ msgid "abcdefghijk ABCDEFGHIJK"
 #~ msgstr "abcdefghijk ABCDEFGHIJK"