1 files changed, 52 insertions, 48 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9e662d271..4a57aaf9c 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-10-25 08:49+0000\n"
+"POT-Creation-Date: 2015-11-07 14:36+0300\n"
+"PO-Revision-Date: 2015-11-03 09:06+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -501,7 +501,7 @@ msgstr "帮助"
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "关闭"
@@ -1756,7 +1756,7 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "交易"
 
@@ -1849,14 +1849,15 @@ msgstr "说话"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "购买"
 
@@ -1870,9 +1871,10 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "出售"
 
@@ -2068,7 +2070,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr "清除"
 
@@ -2855,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "添加"
+
+#. TRANSLATORS: sell dialog button
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: quit dialog name
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2873,9 +2888,9 @@ msgstr "退出"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
@@ -2886,9 +2901,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 #: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
@@ -2898,7 +2913,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
 #: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
@@ -2906,8 +2921,8 @@ msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:351
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
@@ -4349,7 +4364,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -5158,9 +5173,8 @@ msgstr "Gui 透明度"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:149
-#, fuzzy
 msgid "Enable gui opacity"
-msgstr "Gui 透明度"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:154
@@ -5434,7 +5448,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "物品栏"
 
@@ -5446,7 +5460,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5541,7 +5555,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5589,20 +5603,21 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:637 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -6302,17 +6317,6 @@ msgstr ""
 msgid "Send"
 msgstr "发送"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "添加"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6463,32 +6467,32 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "重置"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -8216,12 +8220,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr "仓库"
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""