1 files changed, 72 insertions, 56 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 70fa12527..8418dc40f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -381,84 +381,84 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "人类"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -466,58 +466,58 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2147,7 +2147,7 @@ msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "玩家"
 
@@ -5349,7 +5349,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5368,109 +5370,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "显示性别"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "显示水平"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "显示自己的名字"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "目标死球员"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "可见姓名"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "显示球员弹出窗口"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "显示状态"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7765,7 +7778,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -7780,12 +7793,12 @@ msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -10852,3 +10865,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Visible names"
+#~ msgstr "可见姓名"