summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-05 23:42:11 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-05 23:42:11 +0300
commite5a57674e9cd7502e13218d20d7067f2fb4d96f5 (patch)
tree448d313cb4e54b1b6cac2866b9fd805b7692793c /po
parent71fabd18ce7ea41a5bdfbe1724a767706bb01d84 (diff)
downloadplus-e5a57674e9cd7502e13218d20d7067f2fb4d96f5.tar.gz
plus-e5a57674e9cd7502e13218d20d7067f2fb4d96f5.tar.bz2
plus-e5a57674e9cd7502e13218d20d7067f2fb4d96f5.tar.xz
plus-e5a57674e9cd7502e13218d20d7067f2fb4d96f5.zip
Update translations.
Diffstat (limited to 'po')
-rw-r--r--po/ar.po486
-rw-r--r--po/bg.po486
-rw-r--r--po/ca.po287
-rw-r--r--po/cs.po290
-rw-r--r--po/de.po289
-rw-r--r--po/en_GB.po486
-rw-r--r--po/eo.po486
-rw-r--r--po/es.po300
-rw-r--r--po/et.po486
-rw-r--r--po/fa.po486
-rw-r--r--po/fi.po289
-rw-r--r--po/fr.po290
-rw-r--r--po/he.po486
-rw-r--r--po/hr.po486
-rw-r--r--po/hu.po486
-rw-r--r--po/id.po289
-rw-r--r--po/it.po289
-rw-r--r--po/ja.po289
-rw-r--r--po/ka.po486
-rw-r--r--po/manaplus.pot278
-rw-r--r--po/nb.po486
-rw-r--r--po/nl.po287
-rw-r--r--po/nl_BE.po287
-rw-r--r--po/pl.po289
-rw-r--r--po/pt.po289
-rw-r--r--po/pt_BR.po292
-rw-r--r--po/ru.po290
-rw-r--r--po/sk.po486
-rw-r--r--po/sq.po486
-rw-r--r--po/sv.po289
-rw-r--r--po/sv_SE.po289
-rw-r--r--po/te.po486
-rw-r--r--po/th.po486
-rw-r--r--po/tr.po289
-rw-r--r--po/uk.po290
-rw-r--r--po/vls.po486
-rw-r--r--po/zh_CN.po287
-rw-r--r--po/zh_HK.po486
-rw-r--r--po/zh_TW.po486
39 files changed, 7836 insertions, 6980 deletions
diff --git a/po/ar.po b/po/ar.po
index ccd0ffc15..81f17ca1e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -379,43 +379,43 @@ msgstr[5] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -425,8 +425,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -502,8 +502,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -651,398 +651,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1060,7 +1060,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1244,8 +1244,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1525,20 +1525,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1556,8 +1556,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1654,11 +1655,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "شراء"
@@ -1669,11 +1672,12 @@ msgstr "شراء"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "بيع"
@@ -1682,7 +1686,7 @@ msgstr "بيع"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1708,7 +1712,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1749,7 +1753,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1781,8 +1785,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1794,8 +1798,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1816,8 +1820,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1836,9 +1840,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1916,8 +1922,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1989,10 +1995,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2015,8 +2021,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2042,9 +2048,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2052,41 +2058,41 @@ msgid "Use"
msgstr "استخدام"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2094,155 +2100,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2250,43 +2256,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "إسقاط"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2574,7 +2580,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2610,8 +2616,8 @@ msgstr "مغادرة"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2623,8 +2629,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3835,8 +3841,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4237,14 +4245,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "حذف"
@@ -4890,7 +4896,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "العتاد"
@@ -4901,8 +4909,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "الجردة"
@@ -4911,8 +4919,10 @@ msgstr "الجردة"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5374,7 +5384,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5491,7 +5501,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5503,82 +5513,82 @@ msgid "Equip"
msgstr "استعمال العتاد"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "قسم"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "انتقاء كمّيّة من المواد لإسقاطها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "انتقاء كمّيّة من المواد لقسمها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5836,11 +5846,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "إضافة"
@@ -6017,33 +6025,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7570,10 +7567,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/bg.po b/po/bg.po
index 3bf612a7e..b3a77c581 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1650,11 +1651,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1665,11 +1668,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1678,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4233,14 +4241,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4907,8 +4915,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/ca.po b/po/ca.po
index aef507ab5..7c236523d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
"language/ca/)\n"
@@ -21,7 +21,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -63,95 +63,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Temps d'activitat del client: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "setmana %d"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "Dia %d"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "Hora %d"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "Minut %d"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "Segon %d"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -293,25 +293,25 @@ msgid "Visible on map"
msgstr "Visible al mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Humà"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "esquiva"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -451,37 +451,37 @@ msgstr "Bombolla flotant"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuració"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -497,43 +497,43 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Iniciant sessió"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Entrant al mon de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Sol·licitant personatges"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -549,7 +549,7 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -566,59 +566,59 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Canvi de contrasenya"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Canvi de correu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Error creant el directori d'actualitzacions!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s no existeix i no pot ser creat! Sortint."
@@ -1058,7 +1058,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1468,25 +1468,31 @@ msgid "Skip"
msgstr "Omet"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Grup: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gremi: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Botiga"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr ""
@@ -1528,8 +1534,8 @@ msgstr "Crear grup"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1654,10 +1660,10 @@ msgstr "Parlar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Comprar"
@@ -1671,9 +1677,9 @@ msgstr "Comprar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vendre"
@@ -1683,7 +1689,7 @@ msgstr "Vendre"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1709,7 +1715,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr ""
@@ -1782,8 +1788,8 @@ msgstr "Jugadors"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr ""
@@ -1807,7 +1813,9 @@ msgstr "Element del mapa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr ""
@@ -1995,7 +2003,7 @@ msgstr "Agregar-los tots al intercanvi"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Botiga"
@@ -2045,9 +2053,9 @@ msgstr "Recupera-ho tot"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2097,7 +2105,7 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr ""
@@ -2186,66 +2194,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Deixar caure..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr ""
@@ -2253,43 +2261,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Deixar caure"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr ""
@@ -2577,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2599,7 +2607,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2612,7 +2620,7 @@ msgstr "Sortir"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2625,7 +2633,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2637,7 +2645,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2646,7 +2654,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preu: %s / Total: %s"
@@ -4248,7 +4256,7 @@ msgstr "Permet xiuxiueigs"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Esborra"
@@ -5067,19 +5075,19 @@ msgid "Result"
msgstr "Resultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5844,7 +5852,7 @@ msgstr "Envia"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Afegeix"
@@ -6016,31 +6024,50 @@ msgid "Reset Windows"
msgstr "Restaurar finestres"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Botiga personal"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+msgid "Publish"
+msgstr ""
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Anunciar"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Mostra enllaços al anunci"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+msgid "Unpublish"
+msgstr ""
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Petició d'intercanvi"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vol %s %s acceptes?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Botiga personal"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6427,25 +6454,25 @@ msgstr "Tria Món"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6453,7 +6480,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8436,7 +8463,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sense nom"
@@ -8514,7 +8541,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Objecte desconegut"
@@ -8998,15 +9025,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Error al guardar la captura de pantalla!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Comprar objectes"
-
-#~ msgid "Sell items"
-#~ msgstr "Vendre objectes"
diff --git a/po/cs.po b/po/cs.po
index f8498071b..8d6e990e5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
"cs/)\n"
@@ -26,7 +26,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Soubor byl uploadován"
@@ -39,7 +39,7 @@ msgstr "Soubor byl uploadován"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -68,95 +68,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Vyrovnávací paměť vyčištěna"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Doba běhu klienta: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d týdnů"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d týdnů"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dní"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d dní"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d hodin"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d hodin"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minut"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minut"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d vteřinu"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d vteřin"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Resource images:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Resource orphaned images:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Systémové proměnné uloženy"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Nahráno nastavení do:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Nahráno nastavení serveru do:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Nahrány záznmy do:"
@@ -298,25 +298,25 @@ msgid "Visible on map"
msgstr "Viditelný na mapě"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Člověk"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "uskočení"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "minutí"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -457,37 +457,37 @@ msgstr "Plovoucí bublina"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Nastavení"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Výkon"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Téma"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "O ManaPlus"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Nápověda"
@@ -503,43 +503,43 @@ msgstr "Nápověda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Zavřít"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Vyžaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Vyměňuji herní servery"
@@ -555,7 +555,7 @@ msgstr "Vyměňuji herní servery"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -572,59 +572,59 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s neexistuje a vytvoření selhalo. Končím."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Neplatný host pro update: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -1064,7 +1064,7 @@ msgstr "Zpráva"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Oživ"
@@ -1475,25 +1475,31 @@ msgid "Skip"
msgstr "Přeskočit"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Parta: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guilda: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "PVP hodnost: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Obchod"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Komentář: %s"
@@ -1535,8 +1541,8 @@ msgstr "Vytvořit partu"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1661,10 +1667,10 @@ msgstr "Promluv"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Nákup"
@@ -1678,9 +1684,9 @@ msgstr "Nákup"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Prodej"
@@ -1690,7 +1696,7 @@ msgstr "Prodej"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Přidat komentář"
@@ -1716,7 +1722,7 @@ msgstr "Přidat do seznamu útoku"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Vložit do seznamu ignorovaných"
@@ -1789,8 +1795,8 @@ msgstr "Hráči"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Vykopnout z party"
@@ -1814,7 +1820,9 @@ msgstr "Označit na mapě"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Přejmenovat"
@@ -2002,7 +2010,7 @@ msgstr "Přidat vše k obchodu"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Uložit"
@@ -2052,9 +2060,9 @@ msgstr "Vzít všechny"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2104,7 +2112,7 @@ msgstr "Posunout dolů"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Svléknout"
@@ -2193,66 +2201,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Koupit (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Prodat (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Pozvat do party"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Připojit k chatu %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Zobrazit předměty"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Odeber ze seznamu sběru"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Přidej do seznamu sběru"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Přestat chránit předmět"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Chránit předmět"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Upustit..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Upustit vše"
@@ -2260,43 +2268,43 @@ msgstr "Upustit vše"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Upustit"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "GM příkazy"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Zkontrolovat ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Jdi na"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Zavolej zpět"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Vykopnout"
@@ -2584,7 +2592,7 @@ msgstr "Úroveň: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,7 +2614,7 @@ msgstr "Otevři web adresu"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2619,7 +2627,7 @@ msgstr "Ukončit"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2632,7 +2640,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2644,7 +2652,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2653,7 +2661,7 @@ msgstr "Vše"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %s / Celkem %s"
@@ -4262,7 +4270,7 @@ msgstr "Povolit šeptání"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Smazat"
@@ -5079,19 +5087,19 @@ msgid "Result"
msgstr "Výsledek"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Vytvořit předměty"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Počet:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5863,7 +5871,7 @@ msgstr "Odeslat"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Přidat"
@@ -6035,31 +6043,53 @@ msgid "Reset Windows"
msgstr "Resetovat okna"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Osobní obchod"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polsky"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Oznámit"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Zobrazit odkazy v oznámení"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Prosím zadejte nové jméno"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Anglicky"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Požadavek k obchodování"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s chce %s %s příjímáte?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Osobní obchod"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6444,25 +6474,25 @@ msgstr "Vyber svět"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "kl_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "Jknoflík%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "neznámá klávesa"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JK%d"
@@ -6470,7 +6500,7 @@ msgstr "JK%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "n kl"
@@ -8460,7 +8490,7 @@ msgstr "Moderní OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nepojmenovaný"
@@ -8538,7 +8568,7 @@ msgid "Flee %s"
msgstr "Útěk %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Neznámý předmět"
@@ -9022,14 +9052,24 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Ukládání snímku obrazovky selhalo!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Koupit věci"
-
-#~ msgid "Sell items"
-#~ msgstr "Prodat věci"
diff --git a/po/de.po b/po/de.po
index e8bfac5b6..622b6cf48 100644
--- a/po/de.po
+++ b/po/de.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
@@ -41,7 +41,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -54,7 +54,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -83,95 +83,95 @@ msgstr "Ok"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache geleert"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Client läuft seit: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d Wochen"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d Wochen"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d Tage"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d Tage"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d Stunden"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d Stunden"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d Minuten"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d Minuten"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d Sekunden"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d Sekunden"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Bild-Quellen:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Quelle verwaister Bilddataien:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Ausgabe der Umgebungsvariablen"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -313,25 +313,25 @@ msgid "Visible on map"
msgstr "Sichtbar auf der Karte"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Mensch"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "ausweichen"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -471,37 +471,37 @@ msgstr "Schwebende Blase"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Einstellungen"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Theme"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hilfe"
@@ -517,43 +517,43 @@ msgstr "Hilfe"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Schließen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
@@ -569,7 +569,7 @@ msgstr "Charakterserver wechseln"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -586,59 +586,59 @@ msgid "Error"
msgstr "Fehler"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komm jeder Zeit wieder..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -1079,7 +1079,7 @@ msgstr "Nachricht"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1492,25 +1492,31 @@ msgid "Skip"
msgstr "überspringen"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Gruppe: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gilde: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "PvP-Rang: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Laden"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Kommentar: %s"
@@ -1552,8 +1558,8 @@ msgstr "Gruppe erstellen"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1678,10 +1684,10 @@ msgstr "Sprechen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kaufen"
@@ -1695,9 +1701,9 @@ msgstr "Kaufen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Verkaufen"
@@ -1707,7 +1713,7 @@ msgstr "Verkaufen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Kommentar hinzufügen"
@@ -1733,7 +1739,7 @@ msgstr "Hinzufügen zur normalen Angriffsliste"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Hinzufügen zur Ignorierenliste"
@@ -1806,8 +1812,8 @@ msgstr "Spieler"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Aus Gruppe werfen"
@@ -1831,7 +1837,9 @@ msgstr "Karteneinstellung"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Umbenennen"
@@ -2019,7 +2027,7 @@ msgstr "Alles zum Handeln hinzufügen"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Aufbewahren"
@@ -2069,9 +2077,9 @@ msgstr "Alles abholen"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2121,7 +2129,7 @@ msgstr "Nach unten"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Ausziehen"
@@ -2210,66 +2218,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Kaufen(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Verkaufen(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Lade zu Gruppe ein"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Zeige Items"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Von der Aufhebeliste entfernen"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Zur Aufhebeliste hinzufügen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Wegwerfen..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Alles fallenlassen"
@@ -2277,43 +2285,43 @@ msgstr "Alles fallenlassen"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Wegwerfen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Rauswerfen"
@@ -2601,7 +2609,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2623,7 +2631,7 @@ msgstr "URL öffnen"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2636,7 +2644,7 @@ msgstr "Beenden"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2649,7 +2657,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2661,7 +2669,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2670,7 +2678,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preis: %s / Gesamt: %s"
@@ -4272,7 +4280,7 @@ msgstr "Flüstern erlauben"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Löschen"
@@ -5094,19 +5102,19 @@ msgid "Result"
msgstr "Resultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Menge:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5871,7 +5879,7 @@ msgstr "Absenden"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Hinzufügen"
@@ -6043,31 +6051,52 @@ msgid "Reset Windows"
msgstr "Fenster zurücksetzen"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Persönlicher Laden"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polnisch"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Teile mit"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Zeige Links in Ankündigung"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Englisch"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Erbitte einen Handel"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s möchte %s %s akzeptierst du?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Persönlicher Laden"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6455,25 +6484,25 @@ msgstr "Wähle Welt"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "Taste_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "unbekannte Taste"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6481,7 +6510,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "U-Taste"
@@ -8473,7 +8502,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unbenannt"
@@ -8551,7 +8580,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
@@ -9039,15 +9068,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Kaufe Dinge"
-
-#~ msgid "Sell items"
-#~ msgstr "Verkaufe Dinge"
diff --git a/po/en_GB.po b/po/en_GB.po
index 717b8ad6c..3ccdddf28 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -49,7 +49,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -315,59 +315,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -422,8 +422,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -499,8 +499,8 @@ msgstr "Help"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -648,398 +648,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "Saving screenshot failed!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "Network Error"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1241,8 +1241,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1522,20 +1522,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1553,8 +1553,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "Trade"
@@ -1651,11 +1652,13 @@ msgstr "Talk"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Buy"
@@ -1666,11 +1669,12 @@ msgstr "Buy"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Sell"
@@ -1679,7 +1683,7 @@ msgstr "Sell"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1705,7 +1709,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1746,7 +1750,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1778,8 +1782,8 @@ msgstr "Players"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1791,8 +1795,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1813,8 +1817,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1833,9 +1837,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1913,8 +1919,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1986,10 +1992,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Store"
@@ -2012,8 +2018,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr "Retrieve"
@@ -2039,9 +2045,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2049,41 +2055,41 @@ msgid "Use"
msgstr "Use"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2091,155 +2097,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2247,43 +2253,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "Drop"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2571,7 +2577,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2607,8 +2613,8 @@ msgstr "Exit"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2620,8 +2626,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3832,8 +3838,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "Shop"
@@ -4234,14 +4242,12 @@ msgstr "Allow whispers"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Delete"
@@ -4887,7 +4893,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "Equipment"
@@ -4898,8 +4906,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "Inventory"
@@ -4908,8 +4916,10 @@ msgstr "Inventory"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5371,7 +5381,7 @@ msgid "Whispering to %s: %s"
msgstr "Whispering to %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5488,7 +5498,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5500,82 +5510,82 @@ msgid "Equip"
msgstr "Equip"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "Split"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "All"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "Select amount of items to trade."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "Select amount of items to drop."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr "Select amount of items to store."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr "Select amount of items to retrieve."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "Select amount of items to split."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5825,11 +5835,9 @@ msgstr "Submit"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Add"
@@ -6006,33 +6014,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Request for Trade"
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7559,10 +7556,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/eo.po b/po/eo.po
index 8c25cfa52..f9c45460d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -49,7 +49,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -315,59 +315,59 @@ msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -422,8 +422,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -499,8 +499,8 @@ msgstr "Helpo"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -648,398 +648,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1241,8 +1241,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1522,20 +1522,20 @@ msgstr "Krei partion"
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1553,8 +1553,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1651,11 +1652,13 @@ msgstr "Paroli"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1666,11 +1669,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1679,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1705,7 +1709,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1746,7 +1750,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1778,8 +1782,8 @@ msgstr "Ludantoj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1791,8 +1795,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1813,8 +1817,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1833,9 +1837,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1913,8 +1919,8 @@ msgstr "Forlasi"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1986,10 +1992,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2012,8 +2018,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2039,9 +2045,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2049,41 +2055,41 @@ msgid "Use"
msgstr "Uzi"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2091,155 +2097,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Ignori"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr "Forigi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr "Malignori"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr "Sekvi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2247,43 +2253,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2571,7 +2577,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2607,8 +2613,8 @@ msgstr "Eliri"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr "+"
@@ -2620,8 +2626,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr "-"
@@ -3832,8 +3838,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4234,14 +4242,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Forigi"
@@ -4887,7 +4893,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4898,8 +4906,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4908,8 +4916,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5371,7 +5381,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5488,7 +5498,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5500,82 +5510,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr "Nekonata."
@@ -5825,11 +5835,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Aldoni"
@@ -6006,33 +6014,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7559,10 +7556,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/es.po b/po/es.po
index 11e36f584..8ee15dd88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-29 03:59+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-05 20:28+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
"language/es/)\n"
"Language: es\n"
@@ -33,7 +33,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Archivo subido"
@@ -46,7 +46,7 @@ msgstr "Archivo subido"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -75,95 +75,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Caché limpiada"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d semanas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d días"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d días"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d horas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minutos"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d segundos"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Imágenes de recurso:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Variables de entorno vaciadas"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Configuraciones subidas a:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Configuraciones del servidor subidas a:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Registro subido a:"
@@ -227,7 +227,7 @@ msgstr "¡Jugador ya es %s!"
#: src/actions/commands.cpp:127
#, c-format
msgid "Player successfully %s!"
-msgstr "¡Relación cambiada exitosamente! El jugador ahora es %s!"
+msgstr "¡Relación cambiada exitosamente! ¡El jugador ahora es %s!"
#. TRANSLATORS: change relation
#: src/actions/commands.cpp:129
@@ -306,25 +306,25 @@ msgid "Visible on map"
msgstr "Visibles en el mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "evade"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -464,37 +464,37 @@ msgstr "Burbuja flotante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuración"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Rendimiento"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "Acerca de..."
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ayuda"
@@ -510,43 +510,43 @@ msgstr "Ayuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Cerrar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
@@ -562,7 +562,7 @@ msgstr "Cambiando servidores del juego"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -579,59 +579,59 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registro cancelado"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Servidor de actualización inválido: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -1071,7 +1071,7 @@ msgstr "Mensaje"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Revivir"
@@ -1484,25 +1484,31 @@ msgid "Skip"
msgstr "Saltar"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Grupo: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gremio: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Rango PvP: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Tienda"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Comentario: %s"
@@ -1544,8 +1550,8 @@ msgstr "Crear grupo"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1670,10 +1676,10 @@ msgstr "Hablar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Comprar"
@@ -1687,9 +1693,9 @@ msgstr "Comprar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vender"
@@ -1699,7 +1705,7 @@ msgstr "Vender"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Agregar comentario"
@@ -1725,7 +1731,7 @@ msgstr "Agregar a la lista de ataque"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
@@ -1798,8 +1804,8 @@ msgstr "Jugadores"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Expulsar del grupo"
@@ -1823,7 +1829,9 @@ msgstr "Mapa Objeto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Renombrar"
@@ -2011,7 +2019,7 @@ msgstr "Agregar todo al intercambio"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Almacenar"
@@ -2061,9 +2069,9 @@ msgstr "Recuperar todo"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2113,7 +2121,7 @@ msgstr "Bajar"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Desvestir"
@@ -2202,66 +2210,66 @@ msgstr "Imitar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Comprar (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Vender (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Invitar al grupo"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Unirse al chat %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Mostrar vestimenta"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Remover de lista de recogido"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Agregar a lista de recogido"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Desproteger artículo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Proteger artículo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Tirar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Tirar todo"
@@ -2269,43 +2277,43 @@ msgstr "Tirar todo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Tirar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Comandos GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Chequear IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Ir a"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Llamar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Expulsar"
@@ -2593,7 +2601,7 @@ msgstr "Nivel: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2615,7 +2623,7 @@ msgstr "Abrir url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2628,7 +2636,7 @@ msgstr "Salir"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2641,7 +2649,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2653,7 +2661,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2662,7 +2670,7 @@ msgstr "Máx"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Precio: %s / Total: %s"
@@ -4272,7 +4280,7 @@ msgstr "Permitir mensajes privados"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Borrar"
@@ -5091,19 +5099,19 @@ msgid "Result"
msgstr "Resultado"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Crear artículos"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Cantidad:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5878,7 +5886,7 @@ msgstr "Enviar"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Añadir"
@@ -6052,31 +6060,53 @@ msgid "Reset Windows"
msgstr "Restablecer ventanas"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Tienda personal"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polaco"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Anunciar"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Mostrar enlaces en el anuncio"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Introduzca un nuevo nombre"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Inglés"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Propuesta de intercambio"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quiere %s %s ¿aceptas?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Tienda personal"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6463,25 +6493,25 @@ msgstr "Escoger Mundo"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "tecla desconocida"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6489,7 +6519,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "desc."
@@ -7607,7 +7637,7 @@ msgstr "Almacenamiento"
#. TRANSLATORS: inventory type name
#: src/inventory.cpp:315
msgid "Npc"
-msgstr ""
+msgstr "Npc"
#. TRANSLATORS: command line help
#: src/main.cpp:79
@@ -7682,7 +7712,7 @@ msgstr " -s --server : Servidor de inicio de sesión o IP"
#. TRANSLATORS: command line help
#: src/main.cpp:110
msgid " -y --server-type : Login server type"
-msgstr "-y --server-type : Tipo de servidor de inicio de sesión"
+msgstr " -y --server-type : Tipo de servidor de inicio de sesión"
#. TRANSLATORS: command line help
#: src/main.cpp:112
@@ -8483,7 +8513,7 @@ msgstr "OpenGL Moderno"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anónimo"
@@ -8561,7 +8591,7 @@ msgid "Flee %s"
msgstr "Escaparse %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Elemento desconocido"
@@ -8998,7 +9028,7 @@ msgstr "Tu mercenario fue asesinado."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:392
msgid "Your mercenary was fired."
-msgstr ""
+msgstr "Le dispararon a tu mercenario."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:396
@@ -9049,15 +9079,25 @@ msgstr ""
"Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco "
"en este momento."
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "¡El guardado de la captura de pantalla ha fallado!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Comprar artículos"
-
-#~ msgid "Sell items"
-#~ msgstr "Vender artículos"
diff --git a/po/et.po b/po/et.po
index 110bc4dbb..e1a195bef 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr "Abi"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1650,11 +1651,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1665,11 +1668,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1678,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4233,14 +4241,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Kustuta"
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4907,8 +4915,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/fa.po b/po/fa.po
index 04f36425e..578c004c0 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "خطای شبکه"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1649,11 +1650,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1664,11 +1667,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1677,7 +1681,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr "خروج"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2618,8 +2624,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4232,14 +4240,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "حذف"
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "تجهیزات"
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4906,8 +4914,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5821,11 +5831,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6002,33 +6010,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7555,10 +7552,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/fi.po b/po/fi.po
index 5174b855c..0c1af2f8d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
"language/fi/)\n"
@@ -21,7 +21,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -63,95 +63,95 @@ msgstr "Ok"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d viikkoa"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d päivää"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d tuntia"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minuuttia"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d sekuntia"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Resurssikuvat:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -293,25 +293,25 @@ msgid "Visible on map"
msgstr "Näkyvillä kartalla"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "väistö"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "P"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "-"
@@ -451,37 +451,37 @@ msgstr "Leijuva puhekupla"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Asetukset"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Kuva"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Teema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Apua"
@@ -497,43 +497,43 @@ msgstr "Apua"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Sulje"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
@@ -549,7 +549,7 @@ msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -566,59 +566,59 @@ msgid "Error"
msgstr "Virhe"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -1058,7 +1058,7 @@ msgstr "Viesti"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1468,25 +1468,31 @@ msgid "Skip"
msgstr "Ohita"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Ryhmä: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Kilta: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Kauppa"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Kommentti: %s"
@@ -1528,8 +1534,8 @@ msgstr "Luo ryhmä"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1654,10 +1660,10 @@ msgstr "Keskustele"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Osta"
@@ -1671,9 +1677,9 @@ msgstr "Osta"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Myy"
@@ -1683,7 +1689,7 @@ msgstr "Myy"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Lisää kommentti"
@@ -1709,7 +1715,7 @@ msgstr "Lisää hyökkäyslistaan"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
@@ -1782,8 +1788,8 @@ msgstr "Pelaajat"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Potki ryhmästä"
@@ -1807,7 +1813,9 @@ msgstr "Karttaolio"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Nimeä uudelleen"
@@ -1995,7 +2003,7 @@ msgstr "Lisää kaikki kauppaan"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Varastoi"
@@ -2045,9 +2053,9 @@ msgstr "Ota kaikki"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2097,7 +2105,7 @@ msgstr "Siirrä alas"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Riisu"
@@ -2186,66 +2194,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Osta (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Myy (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Kutsu ryhmään"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Näytä tavarat"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Pudota..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Pudota kaikki"
@@ -2253,43 +2261,43 @@ msgstr "Pudota kaikki"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Pudota"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Potki"
@@ -2577,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2599,7 +2607,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2612,7 +2620,7 @@ msgstr "Sulje"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2625,7 +2633,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2637,7 +2645,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2646,7 +2654,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -4248,7 +4256,7 @@ msgstr "Salli kuiskaukset"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Poista"
@@ -5063,19 +5071,19 @@ msgid "Result"
msgstr "Tulos"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Määrä:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5840,7 +5848,7 @@ msgstr "Lähetä"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Lisää"
@@ -6012,31 +6020,52 @@ msgid "Reset Windows"
msgstr "Palauta ikkunoiden oletusasetukset"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Oma kauppa"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Puola"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Ilmoita"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Näytä linkit ilmoituksessa"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Englanti"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Kaupantekoehdotus"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s haluaa %s %s - hyväksytkö?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Oma kauppa"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6421,25 +6450,25 @@ msgstr "Valitse pelimaailma"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6447,7 +6476,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8434,7 +8463,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nimetön"
@@ -8512,7 +8541,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Tuntematon tavara"
@@ -8997,6 +9026,22 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9004,9 +9049,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
"\"true\", \"false\", \"1\" tai \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Osta tavaroita"
-
-#~ msgid "Sell items"
-#~ msgstr "Myy tavaroita"
diff --git a/po/fr.po b/po/fr.po
index 49c2e7d0b..5d86e4262 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
@@ -32,7 +32,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Fichier mis en ligne"
@@ -45,7 +45,7 @@ msgstr "Fichier mis en ligne"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -74,95 +74,95 @@ msgstr "Ok"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache nettoyé"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d semaines"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d semaines"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d jours"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d jours"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d heures"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d heures"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minutes"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minutes"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d secondes"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d secondes"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Images des ressources :"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Variables d'environnement effacées"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Config ajouté dans :"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Config serveur ajouté dans :"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Historique ajouté dans :"
@@ -307,25 +307,25 @@ msgid "Visible on map"
msgstr "Visible sur la carte"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Humain"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "esquive"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -465,37 +465,37 @@ msgstr "Bulle flottante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuration"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performance"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vidéo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Thème"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "À propos"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Aide"
@@ -511,43 +511,43 @@ msgstr "Aide"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Fermer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
@@ -563,7 +563,7 @@ msgstr "Changement de serveur de jeu"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -580,59 +580,59 @@ msgid "Error"
msgstr "Erreur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Changer d'e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Désinscription réussie"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Hôte de mise à jour invalide : %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mises à jour !"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -1074,7 +1074,7 @@ msgstr "Message"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Ressusciter"
@@ -1488,25 +1488,31 @@ msgid "Skip"
msgstr "Sauter"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Groupe : %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guilde : %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Rang Pvp : %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Boutique"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Commentaire : %s"
@@ -1548,8 +1554,8 @@ msgstr "Créer un groupe"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1674,10 +1680,10 @@ msgstr "Parler"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Acheter"
@@ -1691,9 +1697,9 @@ msgstr "Acheter"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vendre"
@@ -1703,7 +1709,7 @@ msgstr "Vendre"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Ajouter commentaire"
@@ -1729,7 +1735,7 @@ msgstr "Ajouter à la liste d'attaque"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
@@ -1802,8 +1808,8 @@ msgstr "Joueurs"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Éjecter du groupe"
@@ -1827,7 +1833,9 @@ msgstr "Objet de carte"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Renommer"
@@ -2015,7 +2023,7 @@ msgstr "Ajouter tout dans l'échange"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Entreposer"
@@ -2065,9 +2073,9 @@ msgstr "Reprendre tout"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2117,7 +2125,7 @@ msgstr "Aller vers le bas"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Déshabiller"
@@ -2206,66 +2214,66 @@ msgstr "Imiter"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Acheter (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Vendre (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Inviter dans le groupe"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Rejoindre la conversation %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Montrer les objets"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Retirer de la liste de ramassage"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Ajouter à la liste de ramassage"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Objet non protégé"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Objet protégé"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Déposer..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Déposer tout"
@@ -2273,43 +2281,43 @@ msgstr "Déposer tout"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Déposer"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "MJ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Commandes de MJ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Vérifier ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Aller à"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Rappeler"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Virer"
@@ -2597,7 +2605,7 @@ msgstr "Niveau : %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2619,7 +2627,7 @@ msgstr "Ouvrir l'adresse"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2632,7 +2640,7 @@ msgstr "Quitter"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2645,7 +2653,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2657,7 +2665,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2666,7 +2674,7 @@ msgstr "Max."
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prix : %s / Total : %s"
@@ -4281,7 +4289,7 @@ msgstr "Autoriser les messages privés"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Supprimer"
@@ -5103,19 +5111,19 @@ msgid "Result"
msgstr "Résultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Créer des objets"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Montant :"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5885,7 +5893,7 @@ msgstr "Soumettre"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Ajouter"
@@ -6057,31 +6065,53 @@ msgid "Reset Windows"
msgstr "Rétablir les fenêtres"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Boutique Personnelle"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polonais"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Annoncer"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Montrer les liens dans l'annonce"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Merci d'entrer un nouveau nom"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Anglais"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Demande d'échange"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s souhaite %s %s Acceptez-vous ?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Boutique Personnelle"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6472,25 +6502,25 @@ msgstr "Choix du monde"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "touche_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JBoutton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "touche inconnue"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6498,7 +6528,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "touche u"
@@ -8496,7 +8526,7 @@ msgstr "OpenGL Moderne"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anonyme"
@@ -8574,7 +8604,7 @@ msgid "Flee %s"
msgstr "Fuir %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Objet inconnu"
@@ -9063,15 +9093,25 @@ msgstr ""
"Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la "
"banque en ce moment."
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "La capture d'écran a échoué !"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Acheter des objets"
-
-#~ msgid "Sell items"
-#~ msgstr "Vendre des objets"
diff --git a/po/he.po b/po/he.po
index c93523737..a0b217dd3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr "עזרה"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "שמירת תמונת־מסך נכשלה!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "שגיאת רשת"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "סחרר"
@@ -1650,11 +1651,13 @@ msgstr "דבר"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "קנה"
@@ -1665,11 +1668,12 @@ msgstr "קנה"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "מכר"
@@ -1678,7 +1682,7 @@ msgstr "מכר"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr "שחקנים"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "אחסן"
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr "החזר"
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr "השתמש"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "השלך"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr "יציאה"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "חנות"
@@ -4233,14 +4241,12 @@ msgstr "אפשר לחישות"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "מחק"
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "לבוש"
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "ציוד"
@@ -4907,8 +4915,10 @@ msgstr "ציוד"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr "לוחש אל %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr "השתמש"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "פצל"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "הכל"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "בחר כמות חפצים לסחור."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "בחר כמות חפצים להשליך."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr "בחר כמות חפצים לאחסן."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr "בחר כמות חפצים להחזיר."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "בחר כמות חפצים לפצל."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr "שלח"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "הוסף"
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "בקשה למסחר"
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/hr.po b/po/hr.po
index f4c43ff72..d144e8cbb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[2] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -422,8 +422,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -499,8 +499,8 @@ msgstr "Pomoć"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -648,398 +648,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "Mreža Greška"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1241,8 +1241,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1522,20 +1522,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1553,8 +1553,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "Trgovanje"
@@ -1651,11 +1652,13 @@ msgstr "Govori"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kupi"
@@ -1666,11 +1669,12 @@ msgstr "Kupi"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Prodaj"
@@ -1679,7 +1683,7 @@ msgstr "Prodaj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1705,7 +1709,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1746,7 +1750,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1778,8 +1782,8 @@ msgstr "Igrači"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1791,8 +1795,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1813,8 +1817,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1833,9 +1837,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1913,8 +1919,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1986,10 +1992,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Pohrani"
@@ -2012,8 +2018,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr "Preuzmi"
@@ -2039,9 +2045,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2049,41 +2055,41 @@ msgid "Use"
msgstr "Upotrijebi"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2091,155 +2097,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2247,43 +2253,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "Ispusti"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2571,7 +2577,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2607,8 +2613,8 @@ msgstr "Izlaz"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2620,8 +2626,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3832,8 +3838,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "Trgovina"
@@ -4234,14 +4242,12 @@ msgstr "Dozvoli šapate"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Obriši"
@@ -4887,7 +4893,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "Oprema"
@@ -4898,8 +4906,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "Zalihe"
@@ -4908,8 +4916,10 @@ msgstr "Zalihe"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5371,7 +5381,7 @@ msgid "Whispering to %s: %s"
msgstr "Šaptaj prema %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5488,7 +5498,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5500,82 +5510,82 @@ msgid "Equip"
msgstr "Opremi"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "Razdvoji"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "Sve"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "Odaberi količinu predmeta za razmjenu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "Odaberi količinu predmeta za ispuštanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr "Odaberite količinu predmeta za spremanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr "Odaberite iznos predmeta za preuzimanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "Odaberi količinu predmeta za razdvajanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5827,11 +5837,9 @@ msgstr "Dostavi"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Dodaj"
@@ -6008,33 +6016,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Zahtjev za Trgovanje"
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7561,10 +7558,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/hu.po b/po/hu.po
index 3046b59da..e66a3ebd8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr "Súgó"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "Hálózati hiba"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "Üzlet"
@@ -1650,11 +1651,13 @@ msgstr "Csevegés"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Vétel"
@@ -1665,11 +1668,12 @@ msgstr "Vétel"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Eladás"
@@ -1678,7 +1682,7 @@ msgstr "Eladás"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr "Játékosok"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Raktároz"
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr "Magához vesz"
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr "Bevet"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "Eldob"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr "Kilépés"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "Üzlet"
@@ -4233,14 +4241,12 @@ msgstr "Privát engedélyezése"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Törlés"
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "Felszerelés"
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "Táska"
@@ -4907,8 +4915,10 @@ msgstr "Táska"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr "Használ"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "Felosztás"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "Mind"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "Válaszd ki mennyit akarsz eldobni."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr "Válaszd ki a raktározandó mennyiséget."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr "Válaszd ki mennyit veszel magadhoz."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "Válaszd ki az elosztandó mennyiséget."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr "Küldés"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Hozzáad"
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Üzleti ajánlat"
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/id.po b/po/id.po
index 5cbb89561..a08fdf473 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
"language/id/)\n"
@@ -25,7 +25,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Data telah terunggah"
@@ -38,7 +38,7 @@ msgstr "Data telah terunggah"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -67,95 +67,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache dibersihkan"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Klien hidup: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d pekan"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d pekan"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d hari"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d hari"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d jam"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d jam"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d menit"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d menit"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d detik"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d detik"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Sumber gambar:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Sumber gambar tak diketahui:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Variabel sekitar dibuang"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Mengunggah setelan ke:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Mengunggah setelan server ke:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Mengunggah catatan ke:"
@@ -298,25 +298,25 @@ msgid "Visible on map"
msgstr "Terlihat di peta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Manusia"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "menghindar"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -455,37 +455,37 @@ msgstr "Gelembung mengambang"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Pengaturan"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performa"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vidio"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "Tentang"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Bantuan"
@@ -501,43 +501,43 @@ msgstr "Bantuan"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Tutup"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Terhubung ke server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Mengambil karakter"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Terhubung ke server permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Mengganti server"
@@ -553,7 +553,7 @@ msgstr "Mengganti server"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -570,59 +570,59 @@ msgid "Error"
msgstr "Kesalahan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Perubahan Sandi"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Update host tidak ada: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Kesalahan %s tidak ada dan tidak dapat dibuat! Keluar."
@@ -1062,7 +1062,7 @@ msgstr "Pesan"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Hidupkan"
@@ -1473,25 +1473,31 @@ msgid "Skip"
msgstr "Lewati"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Kelompok: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Organisasi: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Ranking pvp: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Toko"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Komentar: %s"
@@ -1533,8 +1539,8 @@ msgstr "Buat kelompok"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1659,10 +1665,10 @@ msgstr "Berbicara"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Beli"
@@ -1676,9 +1682,9 @@ msgstr "Beli"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Jual"
@@ -1688,7 +1694,7 @@ msgstr "Jual"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Tambah komentar"
@@ -1714,7 +1720,7 @@ msgstr "Tambah ke daftar serangan"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Tambah ke daftar abaikan"
@@ -1787,8 +1793,8 @@ msgstr "Pemain"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
@@ -1812,7 +1818,9 @@ msgstr "Item Peta"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Ubah nama"
@@ -2000,7 +2008,7 @@ msgstr "Tambah semua ke dagangan"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Simpan"
@@ -2050,9 +2058,9 @@ msgstr "Ambil semua"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2102,7 +2110,7 @@ msgstr "Bergerak kebawah"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Tanggalkan baju"
@@ -2191,66 +2199,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Beli(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Jual(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Undang ke kelompok"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Gabung obrolan %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Perlihatkan Item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Hapus dari daftar pungut"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Tambah ke daftar pungut"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Batal proteksi item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Proteksi item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Buang..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Buang semua"
@@ -2258,43 +2266,43 @@ msgstr "Buang semua"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Buang"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Komando GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Cek ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Pergi ke"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Panggil balik"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Keluarkan"
@@ -2582,7 +2590,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2604,7 +2612,7 @@ msgstr "Buka url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2617,7 +2625,7 @@ msgstr "Keluar"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2630,7 +2638,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2642,7 +2650,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2651,7 +2659,7 @@ msgstr "Maks"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Harga: %s / Total: %s"
@@ -4251,7 +4259,7 @@ msgstr "Perbolehkan berbisik"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Hapus"
@@ -5065,19 +5073,19 @@ msgid "Result"
msgstr "Hasil"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5840,7 +5848,7 @@ msgstr "Masukan"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Tambah"
@@ -6012,31 +6020,52 @@ msgid "Reset Windows"
msgstr "Atur ulang jendela"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Toko personal"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polandia"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Umumkan"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Perlihatkan link di Umumkan"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Inggris"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Meminta untuk menukar"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s ingin %s %s apakah anda bersedia?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Toko personal"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6421,25 +6450,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6447,7 +6476,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8430,7 +8459,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
@@ -8508,7 +8537,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr ""
@@ -8992,15 +9021,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Gagal menyimpan tangkapan layar!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Beli barang"
-
-#~ msgid "Sell items"
-#~ msgstr "Jual barang"
diff --git a/po/it.po b/po/it.po
index d335e42ec..4d7a2acbc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
"language/it/)\n"
@@ -29,7 +29,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -71,95 +71,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Tempo online: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d settimane"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d giorni"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d ore"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minuti"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d secondi"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -301,25 +301,25 @@ msgid "Visible on map"
msgstr "Visibile nella mappa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Umano"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "Schivato"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "Mancato"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -459,37 +459,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Impostazioni"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Aiuto"
@@ -505,43 +505,43 @@ msgstr "Aiuto"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Chiudi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
@@ -557,7 +557,7 @@ msgstr "Cambiamento server del gioco"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -574,59 +574,59 @@ msgid "Error"
msgstr "Errore"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s non esiste e non può essere creato! Uscita in corso."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -1066,7 +1066,7 @@ msgstr "Messaggio"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1479,25 +1479,31 @@ msgid "Skip"
msgstr "Salta"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Party: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gilda: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Negozio"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Commento: %s"
@@ -1539,8 +1545,8 @@ msgstr "Crea gruppo"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1665,10 +1671,10 @@ msgstr "Parla"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Compra"
@@ -1682,9 +1688,9 @@ msgstr "Compra"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vendi"
@@ -1694,7 +1700,7 @@ msgstr "Vendi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Aggiungi commento"
@@ -1720,7 +1726,7 @@ msgstr "Aggiungi alla lista Attacco"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Aggiungi alla lista Ignora"
@@ -1793,8 +1799,8 @@ msgstr "Giocatori"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Caccia dal party"
@@ -1818,7 +1824,9 @@ msgstr "Oggetto mappa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Rinomina"
@@ -2006,7 +2014,7 @@ msgstr "Aggiungi tutti"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Magazzino"
@@ -2056,9 +2064,9 @@ msgstr "Ritira tutto"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2108,7 +2116,7 @@ msgstr "Muovi Giù"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Spogliati"
@@ -2197,66 +2205,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Compra (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Vendi (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Invita nel party"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Mostra Oggetti"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Rimuovi dalla lista 'Raccogli'"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Aggiungi alla lista 'Raccogli'"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Lascia..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Lascia tutto"
@@ -2264,43 +2272,43 @@ msgstr "Lascia tutto"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Lascia"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Caccia"
@@ -2588,7 +2596,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2610,7 +2618,7 @@ msgstr "Apri url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2623,7 +2631,7 @@ msgstr "Esci"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2636,7 +2644,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2648,7 +2656,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2657,7 +2665,7 @@ msgstr "Massimo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prezzo: %s / Totale: %s"
@@ -4259,7 +4267,7 @@ msgstr "Permetti sussurri"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Elimina"
@@ -5079,19 +5087,19 @@ msgid "Result"
msgstr "Risultato"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Quantita':"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5856,7 +5864,7 @@ msgstr "Invia"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Aggiungi"
@@ -6028,31 +6036,52 @@ msgid "Reset Windows"
msgstr "Resetta finestre"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Negozio personale"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polacco"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Annuncia"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Mostra link nell'annuncio"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Inglese"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Richiesta di commercio"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vuole %s %s accetti?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Negozio personale"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6439,25 +6468,25 @@ msgstr "Scegli parola"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "pulsante sconosciuto"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6465,7 +6494,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8455,7 +8484,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "senza nome"
@@ -8533,7 +8562,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
@@ -9017,6 +9046,22 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Salvataggio immagine fallito!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9024,9 +9069,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
"\" (falso), \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Compra oggetti"
-
-#~ msgid "Sell items"
-#~ msgstr "Vendi oggetti"
diff --git a/po/ja.po b/po/ja.po
index 769ecaf1d..9a12b732c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
"language/ja/)\n"
@@ -26,7 +26,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -68,95 +68,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントの稼働時間: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d週"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d日"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d時"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d分"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d秒"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "リソースイメージ:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "リソース孤児イメージ:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -298,25 +298,25 @@ msgid "Visible on map"
msgstr "マップに表示させる"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "人間"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "ドッジ"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -455,37 +455,37 @@ msgstr "吹出し"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "ビデオ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "テーマ"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "ヘルプ"
@@ -501,43 +501,43 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "閉じる"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
@@ -553,7 +553,7 @@ msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -570,59 +570,59 @@ msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "パスワードを変更しました!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "登録を解除しました"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sは存在しない為、作成できません."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラ!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しない為、作成できません."
@@ -1062,7 +1062,7 @@ msgstr "メッセージ"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1472,25 +1472,31 @@ msgid "Skip"
msgstr "スキップ"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "パーティ: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "ギルド: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "店"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "コメント: %s"
@@ -1532,8 +1538,8 @@ msgstr "パーティを作る"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1658,10 +1664,10 @@ msgstr "話す"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "買う"
@@ -1675,9 +1681,9 @@ msgstr "買う"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "売る"
@@ -1687,7 +1693,7 @@ msgstr "売る"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "コメントをする"
@@ -1713,7 +1719,7 @@ msgstr "攻撃リストへ追加する"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "攻撃無視リストへ追加する"
@@ -1786,8 +1792,8 @@ msgstr "プレイヤー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "パーティから一時的に追い出す"
@@ -1811,7 +1817,9 @@ msgstr "マップアイテム"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "名前を変更する"
@@ -1999,7 +2007,7 @@ msgstr "トレードウィンドウに全て追加する"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "保管"
@@ -2049,9 +2057,9 @@ msgstr "全部取出す"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2101,7 +2109,7 @@ msgstr "下へ移動"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "脱ぐ"
@@ -2190,66 +2198,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "買う (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "売る (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "パーティへ招待"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "アイテムを表示する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "落とす..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "全て落とす"
@@ -2257,43 +2265,43 @@ msgstr "全て落とす"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "落とす"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "追い出す"
@@ -2581,7 +2589,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2603,7 +2611,7 @@ msgstr "URLを開く"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2616,7 +2624,7 @@ msgstr "終了"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2629,7 +2637,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2641,7 +2649,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2650,7 +2658,7 @@ msgstr "最大"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "価格:%s /合計:%s"
@@ -4252,7 +4260,7 @@ msgstr "全てのささやきを受け取る"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "削除"
@@ -5066,19 +5074,19 @@ msgid "Result"
msgstr "結果"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "量:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5841,7 +5849,7 @@ msgstr "決定"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "追加"
@@ -6013,31 +6021,52 @@ msgid "Reset Windows"
msgstr "ウィンドウをリセットする"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "最大 (15)"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "ポーランド語"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "アナウンス"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "アナウンスにリンクを表示する"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "英語"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "トレードをリクエスト"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%sが%s %sを希望しています。承認しますか?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "最大 (15)"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6424,25 +6453,25 @@ msgstr "世界の選択"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "キー_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "ジョイスティックボタン%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "不明なキー"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6450,7 +6479,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u キー"
@@ -8440,7 +8469,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "名前なし"
@@ -8518,7 +8547,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "不明なアイテム"
@@ -9002,6 +9031,22 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "スクリーンショットを保存できませんでした!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9009,9 +9054,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "購入"
-
-#~ msgid "Sell items"
-#~ msgstr "販売"
diff --git a/po/ka.po b/po/ka.po
index 1e288f452..f300f3424 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1649,11 +1650,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1664,11 +1667,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1677,7 +1681,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2618,8 +2624,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4232,14 +4240,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4906,8 +4914,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5821,11 +5831,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6002,33 +6010,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7555,10 +7552,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 29a2dfbcb..692ef7f08 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -61,95 +61,95 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr ""
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr ""
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr ""
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr ""
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr ""
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -291,25 +291,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr ""
@@ -449,37 +449,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -495,43 +495,43 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr ""
@@ -547,7 +547,7 @@ msgstr ""
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -564,59 +564,59 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1466,25 +1466,31 @@ msgid "Skip"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, c-format
+msgid "Shop: %s"
+msgstr ""
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr ""
@@ -1526,8 +1532,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1652,10 +1658,10 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1669,9 +1675,9 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1681,7 +1687,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1707,7 +1713,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr ""
@@ -1780,8 +1786,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr ""
@@ -1805,7 +1811,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr ""
@@ -1993,7 +2001,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2043,9 +2051,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2095,7 +2103,7 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr ""
@@ -2184,66 +2192,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr ""
@@ -2251,43 +2259,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr ""
@@ -2575,7 +2583,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2597,7 +2605,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2610,7 +2618,7 @@ msgstr ""
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2623,7 +2631,7 @@ msgstr ""
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2635,7 +2643,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2644,7 +2652,7 @@ msgstr ""
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
@@ -4244,7 +4252,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -5058,19 +5066,19 @@ msgid "Result"
msgstr ""
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5835,7 +5843,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6007,31 +6015,50 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr ""
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+msgid "Publish"
+msgstr ""
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr ""
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+msgid "Unpublish"
+msgstr ""
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, c-format
+msgid "Personal Shop - %s"
+msgstr ""
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6416,25 +6443,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6442,7 +6469,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8425,7 +8452,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
@@ -8503,7 +8530,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr ""
@@ -8987,6 +9014,21 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+msgid "Buying store create failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/nb.po b/po/nb.po
index bf5b2453f..523ee1a7f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr "Hjelp"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "Lagring av skjermbilde feilet!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "Nettverksfeil"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1650,11 +1651,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kjøp"
@@ -1665,11 +1668,12 @@ msgstr "Kjøp"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Selg"
@@ -1678,7 +1682,7 @@ msgstr "Selg"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr "Spillere"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr "Bruk"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr "Avslutt"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "Butikk"
@@ -4233,14 +4241,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Slett"
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "Utstyr"
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4907,8 +4915,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "Del opp"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "Alt"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr "Bekreft"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/nl.po b/po/nl.po
index 15f4c8dc7..a4dff7363 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
"language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -36,7 +36,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -65,95 +65,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache gewist"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d weken"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dagen"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d uren"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minuten"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d seconden"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -295,25 +295,25 @@ msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -453,37 +453,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -499,43 +499,43 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -551,7 +551,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -568,59 +568,59 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -1060,7 +1060,7 @@ msgstr "Bericht"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1472,25 +1472,31 @@ msgid "Skip"
msgstr "Overslaan"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Groep: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gilde: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Winkel"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr ""
@@ -1532,8 +1538,8 @@ msgstr "Groep aanmaken"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1658,10 +1664,10 @@ msgstr "Spreken"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kopen"
@@ -1675,9 +1681,9 @@ msgstr "Kopen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Verkopen"
@@ -1687,7 +1693,7 @@ msgstr "Verkopen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1713,7 +1719,7 @@ msgstr "Aan de aanvalslijst toevoegen"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "an de negeerlijst toevoegen"
@@ -1786,8 +1792,8 @@ msgstr "Spelers"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Uit de groep gooien"
@@ -1811,7 +1817,9 @@ msgstr "Plaats voorwerp op de kaart"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Hernoem"
@@ -1999,7 +2007,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Opslaan"
@@ -2049,9 +2057,9 @@ msgstr "Haal alles op"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2101,7 +2109,7 @@ msgstr "Beweeg naar beneden"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "ontkleed"
@@ -2190,66 +2198,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Koop (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Verkoop (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "uitnodigen voor de groep"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Toon Voorwerpen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Neerleggen..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Laat alles vallen"
@@ -2257,43 +2265,43 @@ msgstr "Laat alles vallen"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Neerleggen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Ga naar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Schop"
@@ -2581,7 +2589,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2603,7 +2611,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2616,7 +2624,7 @@ msgstr "Afsluiten"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2629,7 +2637,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2641,7 +2649,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2650,7 +2658,7 @@ msgstr "Maximum"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
@@ -4250,7 +4258,7 @@ msgstr "Fluisteren toestaan"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Verwijderen"
@@ -5070,19 +5078,19 @@ msgid "Result"
msgstr "Resultaat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5847,7 +5855,7 @@ msgstr "Indienen"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Toevoegen"
@@ -6019,31 +6027,50 @@ msgid "Reset Windows"
msgstr "Vensters in beginstand"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Persoonlijke winkel"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+msgid "Publish"
+msgstr ""
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Aankondigingen"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Toon links in aankondigingen"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+msgid "Unpublish"
+msgstr ""
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Handel aanvragen"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s wilt %s %s ga je akkoord?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Persoonlijke winkel"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6430,25 +6457,25 @@ msgstr "Kies Wereld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6456,7 +6483,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u key"
@@ -8443,7 +8470,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
@@ -8521,7 +8548,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Onbekend voorwerp"
@@ -9006,15 +9033,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Opslaan van screenshot mislukt!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Koop voorwerpen"
-
-#~ msgid "Sell items"
-#~ msgstr "Verkoop voorwerpen"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 15f4c8dc7..a4dff7363 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
"language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -36,7 +36,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -65,95 +65,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache gewist"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d weken"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dagen"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d uren"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minuten"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d seconden"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -295,25 +295,25 @@ msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -453,37 +453,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -499,43 +499,43 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -551,7 +551,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -568,59 +568,59 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -1060,7 +1060,7 @@ msgstr "Bericht"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1472,25 +1472,31 @@ msgid "Skip"
msgstr "Overslaan"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Groep: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gilde: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Winkel"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr ""
@@ -1532,8 +1538,8 @@ msgstr "Groep aanmaken"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1658,10 +1664,10 @@ msgstr "Spreken"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kopen"
@@ -1675,9 +1681,9 @@ msgstr "Kopen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Verkopen"
@@ -1687,7 +1693,7 @@ msgstr "Verkopen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1713,7 +1719,7 @@ msgstr "Aan de aanvalslijst toevoegen"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "an de negeerlijst toevoegen"
@@ -1786,8 +1792,8 @@ msgstr "Spelers"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Uit de groep gooien"
@@ -1811,7 +1817,9 @@ msgstr "Plaats voorwerp op de kaart"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Hernoem"
@@ -1999,7 +2007,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Opslaan"
@@ -2049,9 +2057,9 @@ msgstr "Haal alles op"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2101,7 +2109,7 @@ msgstr "Beweeg naar beneden"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "ontkleed"
@@ -2190,66 +2198,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Koop (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Verkoop (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "uitnodigen voor de groep"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Toon Voorwerpen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Neerleggen..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Laat alles vallen"
@@ -2257,43 +2265,43 @@ msgstr "Laat alles vallen"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Neerleggen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Ga naar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Schop"
@@ -2581,7 +2589,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2603,7 +2611,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2616,7 +2624,7 @@ msgstr "Afsluiten"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2629,7 +2637,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2641,7 +2649,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2650,7 +2658,7 @@ msgstr "Maximum"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
@@ -4250,7 +4258,7 @@ msgstr "Fluisteren toestaan"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Verwijderen"
@@ -5070,19 +5078,19 @@ msgid "Result"
msgstr "Resultaat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5847,7 +5855,7 @@ msgstr "Indienen"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Toevoegen"
@@ -6019,31 +6027,50 @@ msgid "Reset Windows"
msgstr "Vensters in beginstand"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Persoonlijke winkel"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+msgid "Publish"
+msgstr ""
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Aankondigingen"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Toon links in aankondigingen"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+msgid "Unpublish"
+msgstr ""
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Handel aanvragen"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s wilt %s %s ga je akkoord?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Persoonlijke winkel"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6430,25 +6457,25 @@ msgstr "Kies Wereld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6456,7 +6483,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u key"
@@ -8443,7 +8470,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
@@ -8521,7 +8548,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Onbekend voorwerp"
@@ -9006,15 +9033,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Opslaan van screenshot mislukt!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Koop voorwerpen"
-
-#~ msgid "Sell items"
-#~ msgstr "Verkoop voorwerpen"
diff --git a/po/pl.po b/po/pl.po
index 766681e75..4ceaeb813 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
"pl/)\n"
@@ -27,7 +27,7 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Plik wysłano"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -69,95 +69,95 @@ msgstr "Ok"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache opróżnione"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Czas pracy programu: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d tygodni/e"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d tygodni/e"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dni"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d dni"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d godzin/y"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d godzin/y"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minut/y"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minut/y"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d sekund/y"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d sekund/y"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Obrazy źródłowe:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Osierocone obrazy źródłowe:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Zmienne środowiskowe zostały zrzucone"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Załaduj ustawienia do:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Załaduj ustawienia serwera do:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Załaduj log do:"
@@ -299,25 +299,25 @@ msgid "Visible on map"
msgstr "Widoczne na mapie"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Człowiek"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "Unik!"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "Pudło!"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -458,37 +458,37 @@ msgstr "Bąbelek nad głową"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Konfiguracja"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Wydajność"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Ekran"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Skórka"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "O..."
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Pomoc"
@@ -504,43 +504,43 @@ msgstr "Pomoc"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Zamknij"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Zmiana serwera"
@@ -556,7 +556,7 @@ msgstr "Zmiana serwera"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -573,59 +573,59 @@ msgid "Error"
msgstr "Błąd"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Nieprawidłowy host aktualizacyjny: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -1065,7 +1065,7 @@ msgstr "Wiadomość"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Wskrześ"
@@ -1478,25 +1478,31 @@ msgid "Skip"
msgstr "Omiń"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Grupa: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Gildia: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Miejsce w PvP: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Sklep"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Komentarz: %s"
@@ -1538,8 +1544,8 @@ msgstr "Utwórz grupę"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1664,10 +1670,10 @@ msgstr "Rozmowa"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kup"
@@ -1681,9 +1687,9 @@ msgstr "Kup"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Sprzedaj"
@@ -1693,7 +1699,7 @@ msgstr "Sprzedaj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Dodaj komentarz"
@@ -1719,7 +1725,7 @@ msgstr "Dodaj do listy atakowanych"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Dodaj do listy ignorowanych"
@@ -1792,8 +1798,8 @@ msgstr "Gracze"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Wyrzuć z grupy"
@@ -1817,7 +1823,9 @@ msgstr "Portal"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Zmień nazwę"
@@ -2005,7 +2013,7 @@ msgstr "Dodaj wszystko do handlu"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Podaj"
@@ -2055,9 +2063,9 @@ msgstr "Pobierz wszystko"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2107,7 +2115,7 @@ msgstr "W dół"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Rozbierz"
@@ -2196,66 +2204,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Kup (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Sprzedaj (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Zaproś do grupy"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Pokaż przedmioty"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Usuń z listy podnoszonych"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Dodaj do listy podnoszonych"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Przestań chronić przedmiot"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Chroń przedmiot"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Upuść..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Upuść wszystko"
@@ -2263,43 +2271,43 @@ msgstr "Upuść wszystko"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Upuść"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Polecenia GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Sprawdź IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Idź do"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Przywołaj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Wyrzuć"
@@ -2587,7 +2595,7 @@ msgstr "Poziom: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2609,7 +2617,7 @@ msgstr "Otwórz adres url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2622,7 +2630,7 @@ msgstr "Wyjdź"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2635,7 +2643,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2647,7 +2655,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2656,7 +2664,7 @@ msgstr "Maks."
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %s/ Razem: %s"
@@ -4262,7 +4270,7 @@ msgstr "Zezwól na szepty"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Usuń"
@@ -5081,19 +5089,19 @@ msgid "Result"
msgstr "Rezultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Utwórz przedmioty"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Ilość:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5865,7 +5873,7 @@ msgstr "Zatwierdź"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Dodaj"
@@ -6037,31 +6045,52 @@ msgid "Reset Windows"
msgstr "Zresetuj okna"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Własny sklep"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polish"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Ogłoś"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Pokazuj linki w ogłoszeniach"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "English"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Prośba o handel"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s chce %s%s, akceptujesz?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Własny sklep"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6448,25 +6477,25 @@ msgstr "Wybierz świat"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "key_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "nieznany klawisz"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6474,7 +6503,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "(nieznany)"
@@ -8459,7 +8488,7 @@ msgstr "Nowoczesny OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nienazwany"
@@ -8537,7 +8566,7 @@ msgid "Flee %s"
msgstr "Ominięcie %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Nieznany przedmiot"
@@ -9025,14 +9054,24 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Kupuj"
-
-#~ msgid "Sell items"
-#~ msgstr "Sprzedaj"
diff --git a/po/pt.po b/po/pt.po
index e7811b9ec..b4eee6ae4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
@@ -23,7 +23,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -36,7 +36,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -65,95 +65,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache limpo"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d semanas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dias"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d dias"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d horas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minutos"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d segundos"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Recursos de imagens:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Variáveis ​​de ambiente despejadas"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -295,25 +295,25 @@ msgid "Visible on map"
msgstr "Visivel no mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "l"
@@ -453,37 +453,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -499,43 +499,43 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
@@ -551,7 +551,7 @@ msgstr "Mudando servidores do jogo"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -568,59 +568,59 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -1060,7 +1060,7 @@ msgstr "Mensagem"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1474,25 +1474,31 @@ msgid "Skip"
msgstr "Passar"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Grupo: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guilda: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Posição no PVP: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Loja"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Comentário: %s"
@@ -1534,8 +1540,8 @@ msgstr "Criar grupo"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1660,10 +1666,10 @@ msgstr "Falar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Comprar"
@@ -1677,9 +1683,9 @@ msgstr "Comprar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vender"
@@ -1689,7 +1695,7 @@ msgstr "Vender"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Adicionar comentário"
@@ -1715,7 +1721,7 @@ msgstr "Adicionar a lista de ataques"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1788,8 +1794,8 @@ msgstr "Jogadores"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Chutar do grupo"
@@ -1813,7 +1819,9 @@ msgstr "Mapa Item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Renomear"
@@ -2001,7 +2009,7 @@ msgstr "Add. todos na negociação"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Armazenar"
@@ -2051,9 +2059,9 @@ msgstr "Retirar tudo"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2103,7 +2111,7 @@ msgstr "Mover a baixo"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Limpar conjunto de roupas"
@@ -2192,66 +2200,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Comprar (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Vender (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Mostar itens"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Remover lista de pegar itens"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Adicionar na lista de pegar itens"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Descartar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Descartar tudo"
@@ -2259,43 +2267,43 @@ msgstr "Descartar tudo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Descartar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Chutar"
@@ -2583,7 +2591,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,7 +2613,7 @@ msgstr "Abrir URL"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2618,7 +2626,7 @@ msgstr "Sair"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2631,7 +2639,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2643,7 +2651,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2652,7 +2660,7 @@ msgstr "Máximo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
@@ -4254,7 +4262,7 @@ msgstr "Permitir mensagens particulares"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Excluir"
@@ -5072,19 +5080,19 @@ msgid "Result"
msgstr "Resultado"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Quantidade:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5854,7 +5862,7 @@ msgstr "Enviar"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Adicionar"
@@ -6026,31 +6034,52 @@ msgid "Reset Windows"
msgstr "Restaurar janelas"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Loja pessoal"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polonês"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Anúncio"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Mostrar links em anúncio"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Inglês"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Proposta de negociação"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Loja pessoal"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6436,25 +6465,25 @@ msgstr "Escolher Mundo"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JBotão%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "Tecla desconhecida"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6462,7 +6491,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "Tecla u"
@@ -8454,7 +8483,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
@@ -8532,7 +8561,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Item desconhecido"
@@ -9017,15 +9046,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Falha ao salvar screenshot!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Comprar itens"
-
-#~ msgid "Sell items"
-#~ msgstr "Vender itens"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d7977e5b7..74bcd1b4f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-29 14:41+0000\n"
-"Last-Translator: Fernanda Monteiro <crie.fernanda@gmail.com>\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"manaplus/language/pt_BR/)\n"
"Language: pt_BR\n"
@@ -34,7 +34,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Arquivo enviado"
@@ -47,7 +47,7 @@ msgstr "Arquivo enviado"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -76,95 +76,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache limpo"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d Semanas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dias"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d Dias"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d Horas"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d Minutos"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d Segundos"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Recursos de imagem:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Variáveis de ambiente despejada"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "A|rquivos de configuração enviados para:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Configuração de servidor enviada para:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Registro enviado em:"
@@ -308,25 +308,25 @@ msgid "Visible on map"
msgstr "Mapa visivel"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -466,37 +466,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Desempenho"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "Sobre"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -512,43 +512,43 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
@@ -564,7 +564,7 @@ msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -581,59 +581,59 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Host de atualização inválido: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -1073,7 +1073,7 @@ msgstr "Mensagem"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Reviver"
@@ -1487,25 +1487,31 @@ msgid "Skip"
msgstr "Passar"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Grupo: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guilda: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Posição no PVP: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Loja"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Comentário: %s"
@@ -1547,8 +1553,8 @@ msgstr "Criar grupo"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1673,10 +1679,10 @@ msgstr "Falar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Comprar"
@@ -1690,9 +1696,9 @@ msgstr "Comprar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Vender"
@@ -1702,7 +1708,7 @@ msgstr "Vender"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Adicionar comentário"
@@ -1728,7 +1734,7 @@ msgstr "Adicionar a lista de ataques"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1801,8 +1807,8 @@ msgstr "Jogadores"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Expulsar do grupo"
@@ -1826,7 +1832,9 @@ msgstr "Mapa Item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Renomear"
@@ -2014,7 +2022,7 @@ msgstr "Adicionar todos na negociação"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Armazenar"
@@ -2064,9 +2072,9 @@ msgstr "Retirar tudo"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2116,7 +2124,7 @@ msgstr "Mover para baixo"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Despir"
@@ -2205,66 +2213,66 @@ msgstr "Imitar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Comprar (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "vender (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Entrar no chat %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Mostrar itens"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Remover da lista de pegar"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Adicionar a lista de captura"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Desproteger item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Proteger item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Descartar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Descartar tudo"
@@ -2272,43 +2280,43 @@ msgstr "Descartar tudo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Descartar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Comandos de GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Checar IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Ir à"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Trazer jogador"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Chutar"
@@ -2596,7 +2604,7 @@ msgstr "Nível: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2618,7 +2626,7 @@ msgstr "Abrir URL"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2631,7 +2639,7 @@ msgstr "Sair"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2644,7 +2652,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2656,7 +2664,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2665,7 +2673,7 @@ msgstr "Máximo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
@@ -4271,7 +4279,7 @@ msgstr "Permitir mensagens particulares"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Excluir"
@@ -5089,19 +5097,19 @@ msgid "Result"
msgstr "Resultado"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Criar itens"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Quantidade:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5871,7 +5879,7 @@ msgstr "Enviar"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Adicionar"
@@ -6043,31 +6051,53 @@ msgid "Reset Windows"
msgstr "Restaurar janelas"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Loja pessoal"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polonês"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Anúncio"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Mostrar links em anúncio"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Por favor insira o novo nome"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Inglês"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Proposta de negociação"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Loja pessoal"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6453,25 +6483,25 @@ msgstr "Escolher Mundo"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "BotãoJ%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "Tecla desconhecida"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6479,7 +6509,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "tecla u"
@@ -8471,7 +8501,7 @@ msgstr "OpenGL Moderno"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
@@ -8549,7 +8579,7 @@ msgid "Flee %s"
msgstr "Evasão %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Item desconhecido"
@@ -9038,15 +9068,25 @@ msgstr ""
"Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco "
"neste momento."
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Falha ao salvar screenshot!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Comprar itens"
-
-#~ msgid "Sell items"
-#~ msgstr "Vender itens"
diff --git a/po/ru.po b/po/ru.po
index 2b681bdda..0cae70185 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 10:15+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
@@ -30,7 +30,7 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Файл выгружен"
@@ -43,7 +43,7 @@ msgstr "Файл выгружен"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -72,95 +72,95 @@ msgstr "ОК"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Кеш очищен"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d неделя"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d недель"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d день"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d дней"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d час"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d часов"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d минута"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d минут"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d секунда"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Изображений:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Переменные среды сохранены"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Информация о выгруженном конфиге:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Информация о выгруженном конфиге сервера:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Информация о выгруженном логе:"
@@ -302,25 +302,25 @@ msgid "Visible on map"
msgstr "Видимые на карте"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "Б"
@@ -461,37 +461,37 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Производительность"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "О Программе"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Помощь"
@@ -507,43 +507,43 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -559,7 +559,7 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -576,59 +576,59 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Регистрация удалена"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Некорректный сервер обновлений: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -1068,7 +1068,7 @@ msgstr "Сообщение"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Оживить"
@@ -1482,25 +1482,31 @@ msgid "Skip"
msgstr "Пропустить"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Группа: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Гильдия: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "PvP ранг: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Магазин"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Комментарий: %s"
@@ -1542,8 +1548,8 @@ msgstr "Создать группу"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1668,10 +1674,10 @@ msgstr "Разговор"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Купить"
@@ -1685,9 +1691,9 @@ msgstr "Купить"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Продать"
@@ -1697,7 +1703,7 @@ msgstr "Продать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Добавить комментарий"
@@ -1723,7 +1729,7 @@ msgstr "Добавить в список атаки"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
@@ -1796,8 +1802,8 @@ msgstr "Игроки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Выкинуть из группы"
@@ -1821,7 +1827,9 @@ msgstr "Элемент карты"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Переименовать"
@@ -2009,7 +2017,7 @@ msgstr "Добавить к торговле все"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Сохранить"
@@ -2059,9 +2067,9 @@ msgstr "Получить все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2111,7 +2119,7 @@ msgstr "Передвинуть ниже"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Раздеть"
@@ -2200,66 +2208,66 @@ msgstr "Имитировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Купить (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Продать (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Присоединиться к чату %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Показать предметы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Удалить из поднятия"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Снять защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Поставить защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Бросить..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Бросить все"
@@ -2267,43 +2275,43 @@ msgstr "Бросить все"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "ГМ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "Коменды ГМ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Проверить IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Перейти"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Вызвать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Кикнуть"
@@ -2591,7 +2599,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2613,7 +2621,7 @@ msgstr "Открыть ссылку"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2626,7 +2634,7 @@ msgstr "Выход"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2639,7 +2647,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2651,7 +2659,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2660,7 +2668,7 @@ msgstr "Макс"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
@@ -4269,7 +4277,7 @@ msgstr "Разрешить шептание"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Удалить"
@@ -5089,19 +5097,19 @@ msgid "Result"
msgstr "Результат"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Создание предметов"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Количество:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5873,7 +5881,7 @@ msgstr "Применить"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Добавить"
@@ -6045,31 +6053,53 @@ msgid "Reset Windows"
msgstr "Сбросить расположение окон"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Свой магазин"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Польский"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Анонс"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Показывать ссылки"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Пожалуйста, введите новое имя"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Английский"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s хочет %s %s, вы принимаете предложение?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Свой магазин"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6456,25 +6486,25 @@ msgstr "Выберите сервер"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "кнопка_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "КнопДж%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "неизвестная кнопка"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "ДЖ%d"
@@ -6482,7 +6512,7 @@ msgstr "ДЖ%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "неиз."
@@ -8470,7 +8500,7 @@ msgstr "Новый OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "безымянный"
@@ -8548,7 +8578,7 @@ msgid "Flee %s"
msgstr "Уклонение %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Неизвестный предмет"
@@ -9033,6 +9063,22 @@ msgid ""
msgstr ""
"Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Ошибка при сохранении снимка экрана!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9040,9 +9086,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Купить"
-
-#~ msgid "Sell items"
-#~ msgstr "Продать"
diff --git a/po/sk.po b/po/sk.po
index e7eff26b6..c1c64b74a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[2] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -422,8 +422,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -499,8 +499,8 @@ msgstr "Nápoveda"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -648,398 +648,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1241,8 +1241,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1522,20 +1522,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1553,8 +1553,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1651,11 +1652,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Kúpiť"
@@ -1666,11 +1669,12 @@ msgstr "Kúpiť"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Predaj"
@@ -1679,7 +1683,7 @@ msgstr "Predaj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1705,7 +1709,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1746,7 +1750,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1778,8 +1782,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1791,8 +1795,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1813,8 +1817,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1833,9 +1837,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1913,8 +1919,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1986,10 +1992,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2012,8 +2018,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2039,9 +2045,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2049,41 +2055,41 @@ msgid "Use"
msgstr "Použiť"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2091,155 +2097,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2247,43 +2253,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "Zahodiť"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2571,7 +2577,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2607,8 +2613,8 @@ msgstr "Ukončiť"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2620,8 +2626,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3832,8 +3838,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "Obchod"
@@ -4234,14 +4242,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Vymazať"
@@ -4887,7 +4893,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "Vybavenie"
@@ -4898,8 +4906,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "Inventár"
@@ -4908,8 +4916,10 @@ msgstr "Inventár"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5371,7 +5381,7 @@ msgid "Whispering to %s: %s"
msgstr "Nápoveda pre %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5488,7 +5498,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5500,82 +5510,82 @@ msgid "Equip"
msgstr "Vystrojiť"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "Zvoľte množstvo vecí k predaju."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "Zvoľte množstvo vecí k zahodeniu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "Zvoľte množstvo vecí k rozdeleniu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5827,11 +5837,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6008,33 +6016,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7561,10 +7558,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/sq.po b/po/sq.po
index c7cb030db..d93ce0800 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1650,11 +1651,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1665,11 +1668,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1678,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4233,14 +4241,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4907,8 +4915,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/sv.po b/po/sv.po
index 96ffbd749..36d49ae62 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
"manaplus/language/sv_SE/)\n"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -62,95 +62,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache rensad"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Klientupptid: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d vecka"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d veckor"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dag"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d dagar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d timme"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d timmar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minut"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minuter"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d sekund"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Resurs-bilder:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Föräldralösa resurs-bilder:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Omgivningsvariabler dumpade"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -292,25 +292,25 @@ msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -450,37 +450,37 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjälp"
@@ -496,43 +496,43 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -548,7 +548,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -565,59 +565,59 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Felaktig uppdaterings-host: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
@@ -1057,7 +1057,7 @@ msgstr "Meddelande"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Återuppliva"
@@ -1467,25 +1467,31 @@ msgid "Skip"
msgstr "Skippa"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Party: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guild: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Pvp-rank: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Shop"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Kommentar: %s"
@@ -1527,8 +1533,8 @@ msgstr "Skapa Party"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1653,10 +1659,10 @@ msgstr "Prata med"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Köp"
@@ -1670,9 +1676,9 @@ msgstr "Köp"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Sälj"
@@ -1682,7 +1688,7 @@ msgstr "Sälj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1708,7 +1714,7 @@ msgstr "Lägg till i attacklistan"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Lägg till i ignoreringslistan"
@@ -1781,8 +1787,8 @@ msgstr "Spelare"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Kicka från party"
@@ -1806,7 +1812,9 @@ msgstr "Kartobjekt"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Ändra namn"
@@ -1994,7 +2002,7 @@ msgstr "Lägg till alla för trade"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Lagra"
@@ -2044,9 +2052,9 @@ msgstr "Hämta ut alla"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2096,7 +2104,7 @@ msgstr "Flytta ner"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Klä av"
@@ -2185,66 +2193,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Köp (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Sälj (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Bjud in till party"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Visa Items"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Ta bort från pickup-listan"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Lägg till i pickup-listan"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Skydda inte item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Skydda item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Släng..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Släng allt"
@@ -2252,43 +2260,43 @@ msgstr "Släng allt"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Släng"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "GM-kommandon"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Granska ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Goto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Återkalla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Sparka"
@@ -2576,7 +2584,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2598,7 +2606,7 @@ msgstr "Öppna url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2611,7 +2619,7 @@ msgstr "Avsluta"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2624,7 +2632,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2636,7 +2644,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2645,7 +2653,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
@@ -4248,7 +4256,7 @@ msgstr "Tillåt viskningar"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Radera"
@@ -5066,19 +5074,19 @@ msgid "Result"
msgstr "Resultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Skapa items"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Antal:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5850,7 +5858,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Lägg till"
@@ -6022,31 +6030,52 @@ msgid "Reset Windows"
msgstr "Återställ fönster"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Personlig Shop"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polska"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Annonsera"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Visa länkar i annonseringen"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Engelska"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Efterfråga Trade"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vill %s %s, accepterar du?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Personlig Shop"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6433,25 +6462,25 @@ msgstr "Välj värld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "key_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "okänd eller borttappad tangent"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6459,7 +6488,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u-tangenten"
@@ -8450,7 +8479,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
@@ -8528,7 +8557,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Okänt item"
@@ -9012,6 +9041,22 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Spara skärmdump misslyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9019,9 +9064,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Köp items"
-
-#~ msgid "Sell items"
-#~ msgstr "Sälj items"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 96ffbd749..36d49ae62 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
"manaplus/language/sv_SE/)\n"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -62,95 +62,95 @@ msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Cache rensad"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Klientupptid: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d vecka"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d veckor"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d dag"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d dagar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d timme"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d timmar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d minut"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d minuter"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d sekund"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Resurs-bilder:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Föräldralösa resurs-bilder:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Omgivningsvariabler dumpade"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -292,25 +292,25 @@ msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -450,37 +450,37 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjälp"
@@ -496,43 +496,43 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -548,7 +548,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -565,59 +565,59 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Felaktig uppdaterings-host: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
@@ -1057,7 +1057,7 @@ msgstr "Meddelande"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Återuppliva"
@@ -1467,25 +1467,31 @@ msgid "Skip"
msgstr "Skippa"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Party: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guild: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Pvp-rank: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Shop"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Kommentar: %s"
@@ -1527,8 +1533,8 @@ msgstr "Skapa Party"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1653,10 +1659,10 @@ msgstr "Prata med"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Köp"
@@ -1670,9 +1676,9 @@ msgstr "Köp"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Sälj"
@@ -1682,7 +1688,7 @@ msgstr "Sälj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr ""
@@ -1708,7 +1714,7 @@ msgstr "Lägg till i attacklistan"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Lägg till i ignoreringslistan"
@@ -1781,8 +1787,8 @@ msgstr "Spelare"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Kicka från party"
@@ -1806,7 +1812,9 @@ msgstr "Kartobjekt"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Ändra namn"
@@ -1994,7 +2002,7 @@ msgstr "Lägg till alla för trade"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Lagra"
@@ -2044,9 +2052,9 @@ msgstr "Hämta ut alla"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2096,7 +2104,7 @@ msgstr "Flytta ner"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Klä av"
@@ -2185,66 +2193,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Köp (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Sälj (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Bjud in till party"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Visa Items"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Ta bort från pickup-listan"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Lägg till i pickup-listan"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Skydda inte item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Skydda item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Släng..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Släng allt"
@@ -2252,43 +2260,43 @@ msgstr "Släng allt"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Släng"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "GM-kommandon"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Granska ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Goto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Återkalla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Sparka"
@@ -2576,7 +2584,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2598,7 +2606,7 @@ msgstr "Öppna url"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2611,7 +2619,7 @@ msgstr "Avsluta"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2624,7 +2632,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2636,7 +2644,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2645,7 +2653,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
@@ -4248,7 +4256,7 @@ msgstr "Tillåt viskningar"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Radera"
@@ -5066,19 +5074,19 @@ msgid "Result"
msgstr "Resultat"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Skapa items"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Antal:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5850,7 +5858,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Lägg till"
@@ -6022,31 +6030,52 @@ msgid "Reset Windows"
msgstr "Återställ fönster"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Personlig Shop"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polska"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Annonsera"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Visa länkar i annonseringen"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Engelska"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Efterfråga Trade"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vill %s %s, accepterar du?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Personlig Shop"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6433,25 +6462,25 @@ msgstr "Välj värld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "key_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "okänd eller borttappad tangent"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6459,7 +6488,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u-tangenten"
@@ -8450,7 +8479,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
@@ -8528,7 +8557,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Okänt item"
@@ -9012,6 +9041,22 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Spara skärmdump misslyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9019,9 +9064,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Köp items"
-
-#~ msgid "Sell items"
-#~ msgstr "Sälj items"
diff --git a/po/te.po b/po/te.po
index a460890cc..ffcc03193 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -498,8 +498,8 @@ msgstr "సహాయం"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -647,398 +647,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1240,8 +1240,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1521,20 +1521,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1552,8 +1552,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1650,11 +1651,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1665,11 +1668,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1678,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1704,7 +1708,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1745,7 +1749,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1777,8 +1781,8 @@ msgstr "ఆటగాళ్ళు"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1790,8 +1794,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1812,8 +1816,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1832,9 +1836,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1912,8 +1918,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1985,10 +1991,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2011,8 +2017,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2038,9 +2044,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2048,41 +2054,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2090,155 +2096,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2246,43 +2252,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2570,7 +2576,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,8 +2612,8 @@ msgstr "నిష్క్రమించు"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2619,8 +2625,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3831,8 +3837,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4233,14 +4241,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "తొలగించు"
@@ -4886,7 +4892,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4897,8 +4905,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4907,8 +4915,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5370,7 +5380,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5487,7 +5497,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5499,82 +5509,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "అన్నీ"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5824,11 +5834,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6005,33 +6013,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7558,10 +7555,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/th.po b/po/th.po
index 8fc6a9b40..8b378ed8e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1649,11 +1650,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "ซื้อ"
@@ -1664,11 +1667,12 @@ msgstr "ซื้อ"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1677,7 +1681,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr "ใช้"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "ทิ้ง"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr "ออก"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2618,8 +2624,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4232,14 +4240,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "ลบทิ้ง"
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4906,8 +4914,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5821,11 +5831,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6002,33 +6010,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7555,10 +7552,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/tr.po b/po/tr.po
index b3046736a..f5ab0527a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
"language/tr/)\n"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Dosya yüklendi"
@@ -35,7 +35,7 @@ msgstr "Dosya yüklendi"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -64,95 +64,95 @@ msgstr "TAMAM"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Bellek temizlendi"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Client çalışma süresi: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d hafta"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d haftalar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d gün"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d günler"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d saat"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d saatler"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d dakika"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d dakikalar"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d saniye"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d saniyeler"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Kaynak resimleri:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Edinilmiş kaynak resimleri:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Çevre değişkenleri yığıldı"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Config bilgisi şuraya yüklendi:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Server configi şuraya yüklendi:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Log kayıtları şuraya yüklendi:"
@@ -294,25 +294,25 @@ msgid "Visible on map"
msgstr "Haritada görünür"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "İnsan"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "kaçınıldı"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "kaçırıldı"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "İ"
@@ -452,37 +452,37 @@ msgstr "Yüzen balon"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Ayarlar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performans"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "Hakkında"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Yardım"
@@ -498,43 +498,43 @@ msgstr "Yardım"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Kapat"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Giriş yapılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Oyun sunucusu değiştiriliyor"
@@ -550,7 +550,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -567,59 +567,59 @@ msgid "Error"
msgstr "Hata"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Şifre Değiştir"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "E-posta Değiştir"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Kayıt silme başarılı"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Geçersiz sunucu güncellemesi: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Güncelleme klasörleri yaratılırken hata oluştu!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
@@ -1059,7 +1059,7 @@ msgstr "Mesaj"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Dirilt"
@@ -1473,25 +1473,31 @@ msgid "Skip"
msgstr "Atla"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Parti: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Guild: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "Pvp rütbe: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Mağaza"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Yorum: %s"
@@ -1533,8 +1539,8 @@ msgstr "Parti kur"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1659,10 +1665,10 @@ msgstr "Konuş"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Satın Al"
@@ -1676,9 +1682,9 @@ msgstr "Satın Al"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Sat"
@@ -1688,7 +1694,7 @@ msgstr "Sat"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Yorum ekle"
@@ -1714,7 +1720,7 @@ msgstr "Saldırı listesine ekle"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Gözmezden gelinenler listesine ekle"
@@ -1787,8 +1793,8 @@ msgstr "Oyuncular"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Partiden at"
@@ -1812,7 +1818,9 @@ msgstr "Harita itemi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Yeniden adlandır"
@@ -2000,7 +2008,7 @@ msgstr "Tamamını takasa ekle"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Sakla"
@@ -2050,9 +2058,9 @@ msgstr "Tamamını geri al"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2102,7 +2110,7 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr ""
@@ -2191,66 +2199,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Satın Al (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Gruba davet et"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Nesneleri göster"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Toplama listesinden kaldır"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Toplama listesine ekle"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Bırak..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr ""
@@ -2258,43 +2266,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Bırak"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr ""
@@ -2582,7 +2590,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2604,7 +2612,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2617,7 +2625,7 @@ msgstr "Çıkış"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2630,7 +2638,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2642,7 +2650,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2651,7 +2659,7 @@ msgstr "En Fazla"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Fiyat: %s / Toplam: %s"
@@ -4254,7 +4262,7 @@ msgstr "Fısıltılara izin ver"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Sil"
@@ -5068,19 +5076,19 @@ msgid "Result"
msgstr "Sonuç"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5845,7 +5853,7 @@ msgstr "Onayla"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Ekle"
@@ -6017,31 +6025,52 @@ msgid "Reset Windows"
msgstr "Pencereleri sıfırla"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Kişisel Mağaza"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Polish"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Duyuru"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Duyuruda linkleri göster"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "English"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Takas isteği yolla"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Kişisel Mağaza"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6428,25 +6457,25 @@ msgstr "Dünya Seç"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6454,7 +6483,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8437,7 +8466,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "isimsiz"
@@ -8515,7 +8544,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Bilinmeyen nesne"
@@ -8999,15 +9028,25 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Ekran görüntüsü kaydı başarısız!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
-
-#~ msgid "Buy items"
-#~ msgstr "Nesne satın al"
-
-#~ msgid "Sell items"
-#~ msgstr "Nesne sat"
diff --git a/po/uk.po b/po/uk.po
index ed7f49794..7bf697b9d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
"language/uk/)\n"
@@ -23,7 +23,7 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr "Файл завантажено"
@@ -36,7 +36,7 @@ msgstr "Файл завантажено"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -65,95 +65,95 @@ msgstr "ОК"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr "Кеш прибрано"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr "Час безперервної роботи клієнта: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr "%d тиждень"
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr "%d тижнів"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr "%d день"
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr "%d днів"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr "%d година"
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr "%d годин"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr "%d хвилина"
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr "%d хвилин"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr "%d секунда"
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr "Зображень:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr "Вилучених зображень:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr "Змінні середовища збережені"
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr "Завантажений конфіг:"
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr "Завантажена конфігурація сервера:"
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr "Завантажений лог:"
@@ -297,25 +297,25 @@ msgid "Visible on map"
msgstr "Видимий на мапі"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr "Людина"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "ухилення"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -456,37 +456,37 @@ msgstr "Плаваюча бульбашка"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Налаштування"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Продуктивність"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Відео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "Теми"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr "Про програму"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Довідка"
@@ -502,43 +502,43 @@ msgstr "Довідка"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "Закрити"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Очікування відповіді сервера"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "Авторизація..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "Поринаємо в ігровий всесвіт..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Завантаження списку персонажів..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "Приєднання до серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "Зміна ігрового серверу..."
@@ -554,7 +554,7 @@ msgstr "Зміна ігрового серверу..."
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -571,59 +571,59 @@ msgid "Error"
msgstr "Помилка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "Запитуємо деталі реєстрації"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "Змінити пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "Пароль змінено!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Змінити імейл"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Імейл змінено!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "Акаунт видалено"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "До побачення та вертайтесь."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "Тека %s не існує і не може бути створена! Виходимо."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr "Невідомий сервер оновлення: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "Неможливо створити теку для оновлень!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
@@ -1063,7 +1063,7 @@ msgstr "Повідомлення"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr "Опритомнити"
@@ -1475,25 +1475,31 @@ msgid "Skip"
msgstr "Пропустити"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "Група: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "Гільдія: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr "PVP ранг: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "Крамниця"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "Примітка: %s"
@@ -1535,8 +1541,8 @@ msgstr "Створити групу"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1661,10 +1667,10 @@ msgstr "Діалог"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "Придбати"
@@ -1678,9 +1684,9 @@ msgstr "Придбати"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "Продати"
@@ -1690,7 +1696,7 @@ msgstr "Продати"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "Додати примітку"
@@ -1716,7 +1722,7 @@ msgstr "Додати до списку атаки"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr "Ігнорувати тип мобу"
@@ -1789,8 +1795,8 @@ msgstr "Гравці"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "Виштовхати з групи"
@@ -1814,7 +1820,9 @@ msgstr "Елемент карти"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "Перейменувати"
@@ -2002,7 +2010,7 @@ msgstr "Додати всю кількість"
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Зберегти"
@@ -2052,9 +2060,9 @@ msgstr "Вилучити всю кількість"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2104,7 +2112,7 @@ msgstr "Пріоритет нижче"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr "Роздягнути"
@@ -2193,66 +2201,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "Купувати (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "Продати (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr "Запросити до групи"
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr "Ввійти до чату %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "Показати спорядження"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr "Видалити зі списку підбирання"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr "Додати до списку підбирання"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr "Зняти захист"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr "Захистити предмет"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "Кинути..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "Кинути все"
@@ -2260,43 +2268,43 @@ msgstr "Кинути все"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "Кинути"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr "ГМ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr "ГМ команди"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr "Перевірити IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr "Відвідати"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr "Викликати"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr "Виштовхати"
@@ -2584,7 +2592,7 @@ msgstr "Рівень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2606,7 +2614,7 @@ msgstr "Відвідати посилання"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2619,7 +2627,7 @@ msgstr "Вийти"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2632,7 +2640,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2644,7 +2652,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2653,7 +2661,7 @@ msgstr "Все"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Ціна: %s / Загалом: %s"
@@ -4260,7 +4268,7 @@ msgstr "Дозволити шепіт (приватне спілкування)"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Видалити"
@@ -5074,19 +5082,19 @@ msgid "Result"
msgstr "Результат"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Створення предметів"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr "Кількість:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5858,7 +5866,7 @@ msgstr "Відправити"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Додати"
@@ -6030,31 +6038,53 @@ msgid "Reset Windows"
msgstr "Скинути налаштування вікон"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "Особиста крамниця"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+#, fuzzy
+msgid "Publish"
+msgstr "Польська"
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "Анонс"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "Посилання у анонсі"
+#: src/gui/windows/shopwindow.cpp:319
+#, fuzzy
+msgid "Please enter new shop name"
+msgstr "Будь ласка, вкажіть нове ім'я"
+
+#: src/gui/windows/shopwindow.cpp:403
+#, fuzzy
+msgid "Unpublish"
+msgstr "Англійська"
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "Запит на торгівлю"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "Особиста крамниця"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6439,25 +6469,25 @@ msgstr "Оберіть світ"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "клавіша_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr "КлавішаДж%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr "невідома клавіша"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr "ДЖ%d"
@@ -6465,7 +6495,7 @@ msgstr "ДЖ%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "невід."
@@ -8452,7 +8482,7 @@ msgstr "Новітній OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "казна що"
@@ -8530,7 +8560,7 @@ msgid "Flee %s"
msgstr "Ухилення %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "Невідомий предмет"
@@ -9014,6 +9044,22 @@ msgid ""
"right now."
msgstr "Банк не збирається видавати вам кредити."
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "Збереження скріншоту провалилось!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
@@ -9021,9 +9067,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "Купувати"
-
-#~ msgid "Sell items"
-#~ msgstr "Продавати"
diff --git a/po/vls.po b/po/vls.po
index 94ae20376..dc5d9ef7f 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -47,7 +47,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -313,59 +313,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr ""
@@ -1649,11 +1650,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr ""
@@ -1664,11 +1667,12 @@ msgstr ""
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr ""
@@ -1677,7 +1681,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2618,8 +2624,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr ""
@@ -4232,14 +4240,12 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr ""
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr ""
@@ -4906,8 +4914,10 @@ msgstr ""
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr ""
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr ""
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5823,11 +5833,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr ""
@@ -6004,33 +6012,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7557,10 +7554,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 685d094c3..5b75b885e 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-01-31 12:18+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-02-05 23:29+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+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"
@@ -27,7 +27,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:141
+#: src/actions/actions.cpp:143
msgid "File uploaded"
msgstr ""
@@ -40,7 +40,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:145 src/client.cpp:1446 src/client.cpp:1473
#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -69,95 +69,95 @@ msgstr "确定"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
+#: src/actions/actions.cpp:909 src/actions/actions.cpp:921
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
+#: src/actions/actions.cpp:1049 src/actions/actions.cpp:1105
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d week"
msgstr ""
-#: src/actions/actions.cpp:1055
+#: src/actions/actions.cpp:1060
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d day"
msgstr ""
-#: src/actions/actions.cpp:1066
+#: src/actions/actions.cpp:1071
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hour"
msgstr ""
-#: src/actions/actions.cpp:1076
+#: src/actions/actions.cpp:1081
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minute"
msgstr ""
-#: src/actions/actions.cpp:1086
+#: src/actions/actions.cpp:1091
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d second"
msgstr ""
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1101
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
+#: src/actions/actions.cpp:1162 src/actions/actions.cpp:1171
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
+#: src/actions/actions.cpp:1165 src/actions/actions.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1257
+#: src/actions/actions.cpp:1262
msgid "Environment variables dumped"
msgstr ""
-#: src/actions/actions.cpp:1376
+#: src/actions/actions.cpp:1381
msgid "Uploaded config into:"
msgstr ""
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1390
msgid "Uploaded server config into:"
msgstr ""
-#: src/actions/actions.cpp:1394
+#: src/actions/actions.cpp:1399
msgid "Uploaded log into:"
msgstr ""
@@ -299,25 +299,25 @@ msgid "Visible on map"
msgstr "在地图上可见"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:399
+#: src/being/being.cpp:400
msgid "Human"
msgstr ""
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "dodge"
msgstr "躲闪"
-#: src/being/being.cpp:568
+#: src/being/being.cpp:569
msgid "miss"
msgstr "失误"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1901 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1906 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "I"
@@ -456,37 +456,37 @@ msgstr "流动的泡沫"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:169
+#: src/client.cpp:901 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:931 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:904 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:934 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:907 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "视频"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:937 src/gui/widgets/tabs/setup_theme.cpp:123
+#: src/client.cpp:910 src/gui/widgets/tabs/setup_theme.cpp:123
msgid "Theme"
msgstr "主题"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:940
+#: src/client.cpp:913
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:943 src/gui/windowmenu.cpp:74
+#: src/client.cpp:916 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "帮助"
@@ -502,43 +502,43 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
+#: src/client.cpp:920 src/client.cpp:1374 src/client.cpp:1388
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:255
#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:91
msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1073
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1119
+#: src/client.cpp:1092
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1162
+#: src/client.cpp:1135
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1292
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1332
+#: src/client.cpp:1305
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1344
+#: src/client.cpp:1317
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
@@ -554,7 +554,7 @@ msgstr "正在更改游戏服务器"
#. TRANSLATORS: info message
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error message
-#: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
+#: src/client.cpp:1372 src/client.cpp:1386 src/client.cpp:1581
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:378
@@ -571,59 +571,59 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1401
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1469
+#: src/client.cpp:1442
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1471
+#: src/client.cpp:1444
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1496
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1498
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1525
+#: src/client.cpp:1498
msgid "Unregister Successful"
msgstr "取消注册成功"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1527
+#: src/client.cpp:1500
msgid "Farewell, come back any time..."
msgstr "再见,欢迎随时回来..."
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:488 src/dirs.cpp:496
+#: src/configmanager.cpp:53 src/dirs.cpp:350 src/dirs.cpp:365 src/dirs.cpp:410
+#: src/dirs.cpp:578 src/dirs.cpp:586
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,且无法创建!正在退出."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:370
+#: src/dirs.cpp:460
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:411 src/dirs.cpp:418
+#: src/dirs.cpp:501 src/dirs.cpp:508
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/dirs.cpp:440 src/dirs.cpp:458
+#: src/dirs.cpp:530 src/dirs.cpp:548
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在且无法创建!正在退出."
@@ -1063,7 +1063,7 @@ msgstr "讯息"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2619
msgid "Revive"
msgstr ""
@@ -1473,25 +1473,31 @@ msgid "Skip"
msgstr "跳过"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:135
+#: src/gui/popups/beingpopup.cpp:142
#, c-format
msgid "Party: %s"
msgstr "团队:%s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:150
+#: src/gui/popups/beingpopup.cpp:158
#, c-format
msgid "Guild: %s"
msgstr "工会:%s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:164
+#: src/gui/popups/beingpopup.cpp:173
#, c-format
msgid "Pvp rank: %u"
msgstr ""
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:186
+#, fuzzy, c-format
+msgid "Shop: %s"
+msgstr "商店"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:199
#, c-format
msgid "Comment: %s"
msgstr "评论: %s"
@@ -1533,8 +1539,8 @@ msgstr "建立"
#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
-#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
-#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2631 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
@@ -1659,10 +1665,10 @@ msgstr "说话"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/windows/buydialog.cpp:188 src/gui/windows/buydialog.cpp:204
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/shopwindow.cpp:146 src/input/pages/basic.cpp:240
#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "购买"
@@ -1676,9 +1682,9 @@ msgstr "购买"
#. TRANSLATORS: shop window button
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:148
#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "出售"
@@ -1688,7 +1694,7 @@ msgstr "出售"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2474
msgid "Add comment"
msgstr "发表评论"
@@ -1714,7 +1720,7 @@ msgstr "加入攻击清单"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2494
msgid "Add to ignore list"
msgstr ""
@@ -1787,8 +1793,8 @@ msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2443
msgid "Kick from party"
msgstr "踢从党"
@@ -1812,7 +1818,9 @@ msgstr "地图项"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
+#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:596 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/windows/shopwindow.cpp:170
msgid "Rename"
msgstr "重命名"
@@ -2000,7 +2008,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:853 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "存储"
@@ -2050,9 +2058,9 @@ msgstr "检索所有"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2562
#: src/gui/windows/inventorywindow.cpp:185
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windows/inventorywindow.cpp:746 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2102,7 +2110,7 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2471
msgid "Undress"
msgstr ""
@@ -2191,66 +2199,66 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:2381 src/gui/popups/popupmenu.cpp:2396
msgid "Buy (?)"
msgstr "购买(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Sell (?)"
msgstr "出售(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2413 src/gui/popups/popupmenu.cpp:2437
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2460
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2468
msgid "Show Items"
msgstr "显示项目"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2490
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2548
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:859
+#: src/gui/popups/popupmenu.cpp:2577 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:861
msgid "Drop..."
msgstr "掉落..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Drop all"
msgstr "所有"
@@ -2258,43 +2266,43 @@ msgstr "所有"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:864
+#: src/gui/popups/popupmenu.cpp:2586 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:866
msgid "Drop"
msgstr "丢弃"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2597
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2605
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2610
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2624
msgid "Kick"
msgstr ""
@@ -2582,7 +2590,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:665 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2604,7 +2612,7 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:267
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
#: src/input/pages/basic.cpp:216
@@ -2617,7 +2625,7 @@ msgstr "退出"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:259
#: src/gui/windows/itemamountwindow.cpp:163
#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
@@ -2630,7 +2638,7 @@ msgstr "+"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:262
#: src/gui/windows/itemamountwindow.cpp:161
#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
@@ -2642,7 +2650,7 @@ msgstr "-"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:269
#: src/gui/windows/statuswindow.cpp:494 src/gui/windows/statuswindow.cpp:549
#: src/gui/windows/statuswindow.cpp:748 src/gui/windows/statuswindow.cpp:780
msgid "Max"
@@ -2651,7 +2659,7 @@ msgstr "最大"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
+#: src/gui/windows/buydialog.cpp:245 src/gui/windows/buydialog.cpp:573
#, c-format
msgid "Price: %s / Total: %s"
msgstr "价格:%s / 总价:%s"
@@ -4251,7 +4259,7 @@ msgstr "允许密语"
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:103
#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "删除"
@@ -5065,19 +5073,19 @@ msgid "Result"
msgstr "结果"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:169
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:251
+#: src/gui/windows/buydialog.cpp:254
msgid "Amount:"
msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/charcreatedialog.cpp:122
#: src/gui/windows/charselectdialog.cpp:620
#: src/gui/windows/socialwindow.cpp:85
msgid "Create"
@@ -5840,7 +5848,7 @@ msgstr "提交"
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "添加"
@@ -6012,31 +6020,50 @@ msgid "Reset Windows"
msgstr "重置窗口"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:85 src/gui/windows/shopwindow.cpp:1014
msgid "Personal Shop"
msgstr "个人商店"
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:168 src/gui/windows/shopwindow.cpp:405
+msgid "Publish"
+msgstr ""
+
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:177
msgid "Announce"
msgstr "公布"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:179
msgid "Show links in announce"
msgstr "显示在公布的联系"
+#: src/gui/windows/shopwindow.cpp:319
+msgid "Please enter new shop name"
+msgstr ""
+
+#: src/gui/windows/shopwindow.cpp:403
+msgid "Unpublish"
+msgstr ""
+
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:885 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "请求交易"
-#: src/gui/windows/shopwindow.cpp:787
+#: src/gui/windows/shopwindow.cpp:885
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s想要%s %s 你接受吗?"
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:1019
+#, fuzzy, c-format
+msgid "Personal Shop - %s"
+msgstr "个人商店"
+
#. TRANSLATORS: skills dialog button
#: src/gui/windows/skilldialog.cpp:84
msgid "Up"
@@ -6421,25 +6448,25 @@ msgstr "选择世界"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:377
+#: src/input/inputmanager.cpp:379
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:391
+#: src/input/inputmanager.cpp:393
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:421
+#: src/input/inputmanager.cpp:423
#, c-format
msgid "JB%d"
msgstr ""
@@ -6447,7 +6474,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -8432,7 +8459,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:323 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知怪兽"
@@ -8510,7 +8537,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:209
+#: src/resources/db/itemdb.cpp:217
msgid "Unknown item"
msgstr "未知物品"
@@ -8994,14 +9021,24 @@ msgid ""
"right now."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:430
+#, fuzzy
+msgid "Buying store create failed."
+msgstr "保存屏幕快照失败!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:434
+msgid "Buying store create failed. Too many weight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:438
+msgid "Buying store create failed. No items in store."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s的选项是\"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
-
-#~ msgid "Buy items"
-#~ msgstr "购买物品"
-
-#~ msgid "Sell items"
-#~ msgstr "出售物品"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 236ba9d91..81d58d48f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:54+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr "說明"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "交易"
@@ -1649,11 +1650,13 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "購買"
@@ -1664,11 +1667,12 @@ msgstr "購買"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "出售"
@@ -1677,7 +1681,7 @@ msgstr "出售"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr ""
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr "離開"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr ""
@@ -2618,8 +2624,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr ""
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "商店"
@@ -4232,14 +4240,12 @@ msgstr "允許密語"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "刪除"
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "裝備"
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "物品攔"
@@ -4906,8 +4914,10 @@ msgstr "物品攔"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語:%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr "裝備"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "分開"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5821,11 +5831,9 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "增加"
@@ -6002,33 +6010,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7555,10 +7552,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8967f13c1..34eb32c67 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-25 11:25+0300\n"
-"PO-Revision-Date: 2015-01-25 09:55+0000\n"
+"POT-Creation-Date: 2015-01-31 12:18+0300\n"
+"PO-Revision-Date: 2015-02-01 09:54+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:143 src/client.cpp:1473 src/client.cpp:1500
-#: src/gamemodifiers.cpp:425 src/gui/dialogsmanager.cpp:158
+#: src/gamemodifiers.cpp:427 src/gui/dialogsmanager.cpp:158
#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
#: src/gui/widgets/tabs/setup_theme.cpp:344
@@ -48,7 +48,7 @@ msgstr ""
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:165 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -314,59 +314,59 @@ msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:385
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:835
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:839
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:843
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:847
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:850
+#: src/being/localplayer.cpp:851
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:854
+#: src/being/localplayer.cpp:855
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:858
+#: src/being/localplayer.cpp:859
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:862
+#: src/being/localplayer.cpp:863
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:893
+#: src/being/localplayer.cpp:894
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1076 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1113
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
-#: src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1081 src/being/localplayer.cpp:1087
+#: src/being/localplayer.cpp:1093
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2822
+#: src/being/localplayer.cpp:2823
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
+#: src/being/localplayer.cpp:2829 src/being/localplayer.cpp:2854
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2838
+#: src/being/localplayer.cpp:2839
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
+#: src/being/localplayer.cpp:2845 src/being/localplayer.cpp:2859
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3208
+#: src/being/localplayer.cpp:3209
#, c-format
msgid "You see %s"
msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2343
msgid "Completely ignore"
msgstr ""
@@ -497,8 +497,8 @@ msgstr "說明"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:243
-#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:278 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -646,398 +646,398 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:541
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:551
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:634
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:637
msgid "Network Error"
msgstr "網路錯誤"
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:144
+#: src/gamemodifiers.cpp:145
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:146
+#: src/gamemodifiers.cpp:147
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:179
+#: src/gamemodifiers.cpp:180
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:185
+#: src/gamemodifiers.cpp:186
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:190
+#: src/gamemodifiers.cpp:191
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:197
+#: src/gamemodifiers.cpp:198
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:199
+#: src/gamemodifiers.cpp:200
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
msgid "(4) moves to target in distance 4"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
msgid "(6) moves to target in distance 6"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
msgid "(8) moves to target in distance 8"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
msgid "(9) moves to target in distance 9"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:229
+#: src/gamemodifiers.cpp:230
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:231
+#: src/gamemodifiers.cpp:232
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:251
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:252
+#: src/gamemodifiers.cpp:266
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:245 src/gamemodifiers.cpp:257
+#: src/gamemodifiers.cpp:246 src/gamemodifiers.cpp:258
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:247
+#: src/gamemodifiers.cpp:248
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:250
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:259
+#: src/gamemodifiers.cpp:260
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:262
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:298
+#: src/gamemodifiers.cpp:299
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:300
+#: src/gamemodifiers.cpp:301
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:302
+#: src/gamemodifiers.cpp:303
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:304
+#: src/gamemodifiers.cpp:305
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:306
+#: src/gamemodifiers.cpp:307
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:308
+#: src/gamemodifiers.cpp:309
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:310
+#: src/gamemodifiers.cpp:311
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:312
+#: src/gamemodifiers.cpp:313
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:318
+#: src/gamemodifiers.cpp:319
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:320
+#: src/gamemodifiers.cpp:321
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:322
+#: src/gamemodifiers.cpp:323
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:324
+#: src/gamemodifiers.cpp:325
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:326
+#: src/gamemodifiers.cpp:327
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:328
+#: src/gamemodifiers.cpp:329
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:334
+#: src/gamemodifiers.cpp:335
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:336
+#: src/gamemodifiers.cpp:337
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:338
+#: src/gamemodifiers.cpp:339
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:340
+#: src/gamemodifiers.cpp:341
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:342
+#: src/gamemodifiers.cpp:343
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:348
+#: src/gamemodifiers.cpp:349
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:350
+#: src/gamemodifiers.cpp:351
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:352
+#: src/gamemodifiers.cpp:353
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:358
+#: src/gamemodifiers.cpp:359
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:360
+#: src/gamemodifiers.cpp:361
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:362
+#: src/gamemodifiers.cpp:363
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:375
+#: src/gamemodifiers.cpp:376
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:377
+#: src/gamemodifiers.cpp:378
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:379
+#: src/gamemodifiers.cpp:380
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:382
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:384
msgid "(e) empty map view with collision"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:386
msgid "(E) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:388
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:390
msgid "(?) map view"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:396
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:397
+#: src/gamemodifiers.cpp:398
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:399 src/gamemodifiers.cpp:452
+#: src/gamemodifiers.cpp:400 src/gamemodifiers.cpp:454
msgid "(?) away"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:422
+#: src/gamemodifiers.cpp:424
msgid "Away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:448
+#: src/gamemodifiers.cpp:450
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:450
+#: src/gamemodifiers.cpp:452
msgid "(F) free camera mode"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2622
msgid "Revive"
msgstr ""
@@ -1239,8 +1239,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
-#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr ""
@@ -1520,20 +1520,20 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
-#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
-#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
-#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:1782
+#: src/gui/popups/popupmenu.cpp:1832 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1915 src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:2061 src/gui/popups/popupmenu.cpp:2095
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2163 src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:2205 src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2634 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:168
+#: src/gui/windows/itemamountwindow.cpp:167
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1551,8 +1551,9 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
+#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:787
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:320
msgid "Trade"
msgstr "交易"
@@ -1649,11 +1650,13 @@ msgstr "說話"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2374
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
-#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
+#: src/gui/windows/shopwindow.cpp:137 src/input/pages/basic.cpp:240
+#: src/resources/db/npcdb.cpp:147
msgid "Buy"
msgstr "購買"
@@ -1664,11 +1667,12 @@ msgstr "購買"
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
+#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2377
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
-#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
-#: src/resources/db/npcdb.cpp:148
+#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:139
+#: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
msgid "Sell"
msgstr "出售"
@@ -1677,7 +1681,7 @@ msgstr "出售"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2477
msgid "Add comment"
msgstr ""
@@ -1703,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2497
msgid "Add to ignore list"
msgstr ""
@@ -1744,7 +1748,7 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:187 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1776,8 +1780,8 @@ msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
msgid "Kick from party"
msgstr ""
@@ -1789,8 +1793,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
-#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1742
+#: src/gui/popups/popupmenu.cpp:1818 src/gui/popups/popupmenu.cpp:1860
msgid "Add to chat"
msgstr ""
@@ -1811,8 +1815,8 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
-#: src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
msgid "Remove"
msgstr ""
@@ -1831,9 +1835,11 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
+#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr ""
@@ -1911,8 +1917,8 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2201
msgid "Copy to clipboard"
msgstr ""
@@ -1984,10 +1990,10 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
-#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
-#: src/gui/windows/inventorywindow.cpp:261
-#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1814
+#: src/gui/popups/popupmenu.cpp:1855 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:851 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "寄放"
@@ -2010,8 +2016,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
-#: src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
msgid "Retrieve"
msgstr "取回"
@@ -2037,9 +2043,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
-#: src/gui/windows/inventorywindow.cpp:184
-#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2565
+#: src/gui/windows/inventorywindow.cpp:185
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2047,41 +2053,41 @@ msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1969
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1976
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2020 src/gui/popups/popupmenu.cpp:2039
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2026 src/gui/popups/popupmenu.cpp:2045
msgid "Move down"
msgstr ""
@@ -2089,155 +2095,155 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2474
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2135
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2136
+#: src/gui/popups/popupmenu.cpp:2138
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2156
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2247 src/gui/popups/popupmenu.cpp:2283
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2340
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2325 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2253 src/gui/popups/popupmenu.cpp:2328
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/popupmenu.cpp:2289
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2331
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2269
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2319
+#: src/gui/popups/popupmenu.cpp:2337
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2356
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2384 src/gui/popups/popupmenu.cpp:2399
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
msgid "Invite to party"
msgstr ""
-#: src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2463
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2471
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2488
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2493
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2542
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
-#: src/gui/windows/inventorywindow.cpp:821
+#: src/gui/popups/popupmenu.cpp:2580 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:859
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Drop all"
msgstr ""
@@ -2245,43 +2251,43 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
-#: src/gui/windows/inventorywindow.cpp:826
+#: src/gui/popups/popupmenu.cpp:2589 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:864
msgid "Drop"
msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:2600
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2608
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2613
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2616
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2619
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2627
msgid "Kick"
msgstr ""
@@ -2569,7 +2575,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:663 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2605,8 +2611,8 @@ msgstr "離開"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:164
-#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr "增加"
@@ -2618,8 +2624,8 @@ msgstr "增加"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:162
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:161
+#: src/gui/windows/itemamountwindow.cpp:195 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr "減少"
@@ -3830,8 +3836,10 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
+#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:222
msgid "Shop"
msgstr "商店"
@@ -4232,14 +4240,12 @@ msgstr "允許密語"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:91
-#: src/input/pages/gui.cpp:111
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "刪除"
@@ -4885,7 +4891,9 @@ msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
+#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:224
msgid "Equipment"
msgstr "裝備"
@@ -4896,8 +4904,8 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
-#: src/inventory.cpp:299
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:141
+#: src/inventory.cpp:300
msgid "Inventory"
msgstr "物品攔"
@@ -4906,8 +4914,10 @@ msgstr "物品攔"
msgid "CA"
msgstr ""
+#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+#: src/gui/windowmenu.cpp:105 src/gui/windows/inventorywindow.cpp:220
+#: src/inventory.cpp:310
msgid "Cart"
msgstr ""
@@ -5369,7 +5379,7 @@ msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語:%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:166
+#: src/gui/windows/chatwindow.cpp:1733 src/net/eathena/pethandler.cpp:166
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5486,7 +5496,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:183 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5498,82 +5508,82 @@ msgid "Equip"
msgstr "裝備"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:202
msgid "Split"
msgstr "分開"
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
msgid "O"
msgstr ""
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
msgid "E"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:169
msgid "All"
msgstr "全部"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:225
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:229
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:233
msgid "Select amount of items to store."
msgstr "選擇要儲存的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:237
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:241
msgid "Select amount of items to retrieve."
msgstr "選擇要取回的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:245
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:250
+#: src/gui/windows/itemamountwindow.cpp:249
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:253
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:257
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:262
+#: src/gui/windows/itemamountwindow.cpp:261
msgid "Unknown."
msgstr ""
@@ -5821,11 +5831,9 @@ msgstr "確認"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:85
+#: src/gui/windows/shopwindow.cpp:94 src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "增加"
@@ -6002,33 +6010,22 @@ msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
-msgid "Buy items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
-msgid "Sell items"
-msgstr ""
-
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:98
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:100
msgid "Show links in announce"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:173
+#: src/gui/windows/shopwindow.cpp:787 src/net/ea/tradehandler.cpp:173
msgid "Request for Trade"
msgstr "要求交易"
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:787
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -7555,10 +7552,15 @@ msgid "Clear drops window"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:304
+#: src/inventory.cpp:305
msgid "Storage"
msgstr ""
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:315
+msgid "Npc"
+msgstr ""
+
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"