1 files changed, 25 insertions, 21 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4179a1d24..cbaec2d00 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-10 19:03+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-11 10:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -4814,7 +4814,7 @@ msgstr "建立"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "退出"
 
@@ -5727,7 +5727,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "请求交易"
 
@@ -6222,66 +6222,71 @@ msgstr "目标玩家"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+msgid "Catch pet"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Other Keys"
 msgstr "其他按键"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "捡起"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "屏幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "选择OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7806,7 +7811,7 @@ msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
@@ -8269,9 +8274,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:315
-#, fuzzy, c-format
+#, c-format
 msgid "Char from account %s is already in your party!"
-msgstr "%s不在你的帮会中!"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:319
@@ -8281,9 +8286,8 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:323
-#, fuzzy
 msgid "Char is not online!"
-msgstr "谁在线"
+msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27