1 files changed, 73 insertions, 62 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 057f61ce8..079038e10 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: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -39,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -561,41 +561,41 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "关于"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "帮助"
@@ -616,7 +616,7 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -629,32 +629,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -670,7 +670,7 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -684,27 +684,27 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
@@ -1839,29 +1839,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "重量: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "选项:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "交易"
 
@@ -2852,14 +2858,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "物品栏"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "仓库"
 
@@ -2870,7 +2876,7 @@ msgstr "仓库"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3238,7 +3244,7 @@ msgstr "窗口"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "打造"
 
@@ -5275,82 +5281,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6293,7 +6304,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7744,17 +7755,17 @@ msgid "You give:"
 msgstr "你给予:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9150,7 +9161,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "未知的错误."
 
@@ -9454,7 +9465,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9462,23 +9473,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "未知物品"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "旧密码不正确."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "新密码太短."
 
@@ -9600,13 +9611,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9751,8 +9762,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9804,7 +9815,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""