summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-05 01:08:44 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-05 01:08:44 +0300
commitffe7f491b8af07cd5f732951cb9405fd792904c0 (patch)
tree77d68385dbf3b0a13c05305d457d20ee8392ac54 /po
parentaf2f4f8ab50a209502b929082b11a7a07e6c5499 (diff)
downloadplus-ffe7f491b8af07cd5f732951cb9405fd792904c0.tar.gz
plus-ffe7f491b8af07cd5f732951cb9405fd792904c0.tar.bz2
plus-ffe7f491b8af07cd5f732951cb9405fd792904c0.tar.xz
plus-ffe7f491b8af07cd5f732951cb9405fd792904c0.zip
Update translations.
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/cs.po191
-rw-r--r--po/de.po191
-rw-r--r--po/es.po191
-rw-r--r--po/fi.po191
-rw-r--r--po/fr.po197
-rw-r--r--po/id.po191
-rw-r--r--po/it.po191
-rw-r--r--po/ja.po191
-rw-r--r--po/manaplus.pot191
-rw-r--r--po/nl_BE.po191
-rw-r--r--po/pl.po191
-rw-r--r--po/pt.po191
-rw-r--r--po/pt_BR.po191
-rw-r--r--po/ru.po191
-rw-r--r--po/tr.po191
-rw-r--r--po/zh_CN.po191
17 files changed, 1620 insertions, 1443 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5d185af4..24307e9ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -137,6 +137,7 @@ src/resources/db/itemdb.cpp
src/resources/db/moddb.cpp
src/resources/db/monsterdb.cpp
src/resources/db/petdb.cpp
+src/resources/itemtypemapdata.h
src/resources/mapreader.cpp
src/resources/modinfo.cpp
src/resources/notifications.h
diff --git a/po/cs.po b/po/cs.po
index d81552f2d..02c6df5a3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -24,12 +24,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorovat příchozí žádosti o obchodování"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Akceptovat příchozí žádosti o obchodování"
@@ -471,31 +471,31 @@ msgid "Game modifiers are unknown"
msgstr "Modifikátory hry nejsou známy"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Nasledovat: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Následování zrušeno."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imitace: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitace zrušena."
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Vidíš %s"
@@ -533,37 +533,37 @@ msgstr "Plovoucí bublina"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Nastavení"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Výkon"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Téma"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr "O ManaPlus"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Nápověda"
@@ -578,41 +578,41 @@ msgstr "Nápověda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Zavřít"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Vyžaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Vyměňuji herní servery"
@@ -626,7 +626,7 @@ msgstr "Vyměňuji herní servery"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -639,37 +639,37 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
@@ -1428,7 +1428,7 @@ msgstr "Vytvořit partu"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1440,7 +1440,7 @@ msgstr "Vytvořit partu"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Zrušit"
@@ -1677,7 +1677,7 @@ msgstr "Přesunout kameru"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Výstroje"
@@ -1844,8 +1844,8 @@ msgstr "Přidat vše k obchodu"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Uložit"
@@ -1876,7 +1876,7 @@ msgstr "Uschovat všechny"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Vzít"
@@ -1906,11 +1906,14 @@ msgstr "Vzít všechny"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Použít"
@@ -2085,35 +2088,16 @@ msgid "Protect item"
msgstr "Chránit předmět"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Odebrat z vybavení"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Vybavit"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Upustit..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Upustit vše"
@@ -2121,56 +2105,56 @@ msgstr "Upustit vše"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Upustit"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Rozdělit"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "GM příkazy"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Zkontrolovat ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Jdi na"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Zavolej zpět"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Oživ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Vykopnout"
@@ -3181,7 +3165,7 @@ msgstr "Úroveň: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4261,7 +4245,7 @@ msgstr "Povolit upozornění na váhu"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Obchod"
@@ -5303,7 +5287,7 @@ msgstr "VYB"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Vybavení"
@@ -5314,7 +5298,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventář"
@@ -5701,7 +5685,7 @@ msgstr "Přepnout přihlášení"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Hrát"
@@ -5883,11 +5867,38 @@ msgstr "Normální písmo"
msgid "Fonts"
msgstr "Písma"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Odebrat z vybavení"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Věděl jsi že..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Vybavit"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6696,36 +6707,36 @@ msgid "Name: %s"
msgstr "Jméno: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Aktualizuje se..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Připojuji se..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr "Zobrazit všecky novinky (může být pomalé)"
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Proces aktualizace není kompletní."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 silně doporučujeme zkusit"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 aktualizaci později"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Hotovo"
@@ -7572,43 +7583,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nepojmenovaný"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Útok %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Obrana %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "BŽ %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "BM %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Úroveň %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Neznámý předmět"
diff --git a/po/de.po b/po/de.po
index c3a04a14b..8936528e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -33,12 +33,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
@@ -479,31 +479,31 @@ msgid "Game modifiers are unknown"
msgstr "Spielmodifikatoren unbekannt"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Folgen abgebrochen"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitation abgebrochen"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Du siehst %s"
@@ -541,37 +541,37 @@ msgstr "Schwebende Blase"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Einstellungen"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Theme"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Hilfe"
@@ -586,41 +586,41 @@ msgstr "Hilfe"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Schließen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
@@ -634,7 +634,7 @@ msgstr "Charakterserver wechseln"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -647,37 +647,37 @@ msgid "Error"
msgstr "Fehler"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komm jeder Zeit wieder..."
@@ -1438,7 +1438,7 @@ msgstr "Gruppe erstellen"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1450,7 +1450,7 @@ msgstr "Gruppe erstellen"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Abbrechen"
@@ -1687,7 +1687,7 @@ msgstr "Bewege Kamera"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Ausrüstung"
@@ -1854,8 +1854,8 @@ msgstr "Alles zum Handeln hinzufügen"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Aufbewahren"
@@ -1886,7 +1886,7 @@ msgstr "Alles aufbewahren"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Abholen"
@@ -1916,11 +1916,14 @@ msgstr "Alles abholen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Benutzen"
@@ -2095,35 +2098,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Ablegen"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Ausrüsten"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Wegwerfen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Alles fallenlassen"
@@ -2131,56 +2115,56 @@ msgstr "Alles fallenlassen"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Wegwerfen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Aufteilen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Rauswerfen"
@@ -3191,7 +3175,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4271,7 +4255,7 @@ msgstr "Aktiviere Gewichtsbenachrichtigungen"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Laden"
@@ -5311,7 +5295,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Ausrüstung"
@@ -5322,7 +5306,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventar"
@@ -5709,7 +5693,7 @@ msgstr "Login wechseln"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Los!"
@@ -5886,11 +5870,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Ablegen"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Wusstest Du schon..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Ausrüsten"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6702,36 +6713,36 @@ msgid "Name: %s"
msgstr "Name : %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Aktualisiere..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Es wird dringend empfohlen,"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 Du versuchst es später erneut."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Fertig"
@@ -7583,43 +7594,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unbenannt"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
diff --git a/po/es.po b/po/es.po
index d684a02d7..5319a8d59 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -29,12 +29,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las peticiones de intercambio"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
@@ -475,31 +475,31 @@ msgid "Game modifiers are unknown"
msgstr "Los modificadores del juego son desconocidos"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Seguir: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Seguimiento cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imitación: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitación cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Tú ves %s"
@@ -537,37 +537,37 @@ msgstr "Burbuja flotante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuración"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Rendimiento"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr "Acerca de..."
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Ayuda"
@@ -582,41 +582,41 @@ msgstr "Ayuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Cerrar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
@@ -630,7 +630,7 @@ msgstr "Cambiando servidores del juego"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -643,37 +643,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Registro cancelado"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
@@ -1433,7 +1433,7 @@ msgstr "Crear grupo"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1445,7 +1445,7 @@ msgstr "Crear grupo"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Cancelar"
@@ -1682,7 +1682,7 @@ msgstr "Mover cámara"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Vestimenta"
@@ -1849,8 +1849,8 @@ msgstr "Agregar todo al intercambio"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Almacenar"
@@ -1881,7 +1881,7 @@ msgstr "Almacenar todo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Recuperar"
@@ -1911,11 +1911,14 @@ msgstr "Recuperar todo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Usar"
@@ -2090,35 +2093,16 @@ msgid "Protect item"
msgstr "Proteger artículo"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Quitárselo"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equipar"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Tirar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Tirar todo"
@@ -2126,56 +2110,56 @@ msgstr "Tirar todo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Tirar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Dividir"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "Comandos GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Chequear IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Ir a"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Llamar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Revivir"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Expulsar"
@@ -3186,7 +3170,7 @@ msgstr "Nivel: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4267,7 +4251,7 @@ msgstr "Habilitar notificaciones de peso"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Tienda"
@@ -5311,7 +5295,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Equipamiento"
@@ -5322,7 +5306,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventario"
@@ -5713,7 +5697,7 @@ msgstr "Volver al Login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jugar"
@@ -5896,11 +5880,38 @@ msgstr "Fuente normal"
msgid "Fonts"
msgstr "Fuentes"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Quitárselo"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "¿Sabías que..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equipar"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6711,36 +6722,36 @@ msgid "Name: %s"
msgstr "Nombre: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Actualizando..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr "Mostrar todas las noticias (puede ser lento)"
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 El proceso de actualización está incompleto."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Se recomienda encarecidamente que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 lo intentes de nuevo más tarde."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Completado"
@@ -7592,43 +7603,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anónimo"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Ataque %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Defensa %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "PV %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "MP %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Nivel %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Elemento desconocido"
diff --git a/po/fi.po b/po/fi.po
index 9e95b414f..42130a972 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -21,12 +21,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
@@ -467,31 +467,31 @@ msgid "Game modifiers are unknown"
msgstr "Pelimuokkaimet ovat tuntemattomia"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -529,37 +529,37 @@ msgstr "Leijuva puhekupla"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Asetukset"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Kuva"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Teema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Apua"
@@ -574,41 +574,41 @@ msgstr "Apua"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Sulje"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
@@ -622,7 +622,7 @@ msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -635,37 +635,37 @@ msgid "Error"
msgstr "Virhe"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
@@ -1426,7 +1426,7 @@ msgstr "Luo ryhmä"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1438,7 +1438,7 @@ msgstr "Luo ryhmä"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Peru"
@@ -1675,7 +1675,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Asukokonaisuudet"
@@ -1842,8 +1842,8 @@ msgstr "Lisää kaikki kauppaan"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Varastoi"
@@ -1874,7 +1874,7 @@ msgstr "Varastoi kaikki"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Ota"
@@ -1904,11 +1904,14 @@ msgstr "Ota kaikki"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Käytä"
@@ -2083,35 +2086,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Poista varuste käytöstä"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Ota käyttöön"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Pudota..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Pudota kaikki"
@@ -2119,56 +2103,56 @@ msgstr "Pudota kaikki"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Pudota"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Jaa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Potki"
@@ -3179,7 +3163,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4259,7 +4243,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Kauppa"
@@ -5292,7 +5276,7 @@ msgstr "Var"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Varusteet"
@@ -5303,7 +5287,7 @@ msgstr "Tav"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Tavarat"
@@ -5690,7 +5674,7 @@ msgstr "Vaihda sisäänkirjautumistietoja"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Pelaa"
@@ -5867,11 +5851,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Poista varuste käytöstä"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Ota käyttöön"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6678,36 +6689,36 @@ msgid "Name: %s"
msgstr "Nimi: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Päivitetään..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Päivitysprosessi keskeytyi"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Suosittelemme vahvasti että"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 yrität myöhemmin uudelleen"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Valmis"
@@ -7553,43 +7564,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nimetön"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Tuntematon tavara"
diff --git a/po/fr.po b/po/fr.po
index 41856dfb0..84febd516 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
+"PO-Revision-Date: 2014-06-29 01:16+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -29,12 +29,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
@@ -475,31 +475,31 @@ msgid "Game modifiers are unknown"
msgstr "Les modificateurs de jeux sont inconnus"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Suivre : %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Suivi annulé"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imiter : %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitation annulée"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Tu vois %s"
@@ -537,37 +537,37 @@ msgstr "Bulle flottante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuration"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Performance"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Vidéo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Thème"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr "À propos"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Aide"
@@ -582,41 +582,41 @@ msgstr "Aide"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Fermer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
@@ -630,7 +630,7 @@ msgstr "Changement de serveur de jeu"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -643,37 +643,37 @@ msgid "Error"
msgstr "Erreur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Changer d'e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: 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:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Désinscription réussie"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
@@ -1436,7 +1436,7 @@ msgstr "Créer un groupe"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1448,7 +1448,7 @@ msgstr "Créer un groupe"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Annuler"
@@ -1685,7 +1685,7 @@ msgstr "Bouger la caméra"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Costumes"
@@ -1852,8 +1852,8 @@ msgstr "Ajouter tout dans l'échange"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Entreposer"
@@ -1884,7 +1884,7 @@ msgstr "Entreposer tout"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Récupérer"
@@ -1914,11 +1914,14 @@ msgstr "Reprendre tout"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Utiliser"
@@ -2093,35 +2096,16 @@ msgid "Protect item"
msgstr "Objet protégé"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Retirer"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Équiper"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Jeter..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Jeter tout"
@@ -2129,56 +2113,56 @@ msgstr "Jeter tout"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Jeter"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Partager"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "MJ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "Commandes de MJ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Vérifier ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Aller à"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Rappeler"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Ressusciter"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Virer"
@@ -2235,7 +2219,7 @@ msgstr "Monstre visé"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:130
msgid "Target closest monster (without filters)"
-msgstr ""
+msgstr "Cibler le monstre le plus proche (sans filtre)"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:136
@@ -3189,7 +3173,7 @@ msgstr "Niveau : %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4269,7 +4253,7 @@ msgstr "Activer les notifications de poids"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Boutique"
@@ -5318,7 +5302,7 @@ msgstr "Equ"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Équipement"
@@ -5329,7 +5313,7 @@ msgstr "Inv"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventaire"
@@ -5716,7 +5700,7 @@ msgstr "Changer de compte"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jouer"
@@ -5898,11 +5882,38 @@ msgstr "Police d'écriture normale"
msgid "Fonts"
msgstr "Polices d'écriture"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Retirer"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Savais-tu que..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Équiper"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6715,36 +6726,36 @@ msgid "Name: %s"
msgstr "Nom : %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Mise à jour en cours..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr "Afficher toutes les nouvelles (peut être lent)"
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Le processus de mise à jour n'est pas achevé"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Il est fortement recommandé de"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 Essayes de nouveau plus tard."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Terminé"
@@ -7602,43 +7613,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anonyme"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Attaque %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Défense %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "PV %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "PM %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Niveau %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Objet inconnu"
diff --git a/po/id.po b/po/id.po
index 9112a35fb..b755d7371 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Abaikan permohonan transaksi"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
@@ -467,31 +467,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Batal mengikuti"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Batal menirukan"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -529,37 +529,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Pengaturan"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Bantuan"
@@ -574,41 +574,41 @@ msgstr "Bantuan"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Tutup"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Terhubung dengan server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Pemilihan karakter"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Pergantian server"
@@ -622,7 +622,7 @@ msgstr "Pergantian server"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -635,37 +635,37 @@ msgid "Error"
msgstr "Kesalahan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Ubah sandi"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
@@ -1425,7 +1425,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1437,7 +1437,7 @@ msgstr ""
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Batal"
@@ -1674,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Setelan"
@@ -1841,8 +1841,8 @@ msgstr "Tambahkan semua ke Penukaran"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Simpan"
@@ -1873,7 +1873,7 @@ msgstr "Masukkan semua"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Kembalikan"
@@ -1903,11 +1903,14 @@ msgstr "Ambil semua"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Gunakan"
@@ -2082,35 +2085,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Lepaskan"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Pakai"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Buang..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Buang semuanya"
@@ -2118,56 +2102,56 @@ msgstr "Buang semuanya"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Buang"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Pecah"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "keluarkan"
@@ -3178,7 +3162,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4256,7 +4240,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Toko"
@@ -5288,7 +5272,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Perlengkapan"
@@ -5299,7 +5283,7 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Perbekalan"
@@ -5686,7 +5670,7 @@ msgstr "Ubah Login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Main"
@@ -5863,11 +5847,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Lepaskan"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Pakai"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6672,36 +6683,36 @@ msgid "Name: %s"
msgstr "Nama: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Mengupdate..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Menyambung..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr ""
@@ -7545,43 +7556,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 3235f08dc..c57a09d3f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -26,12 +26,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno ignorate"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno accettate"
@@ -472,31 +472,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Modalità Segui cancellata"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Modalità Imitazione cancellata"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -534,37 +534,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Impostazioni"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Aiuto"
@@ -579,41 +579,41 @@ msgstr "Aiuto"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Chiudi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
@@ -627,7 +627,7 @@ msgstr "Cambiamento server del gioco"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -640,37 +640,37 @@ msgid "Error"
msgstr "Errore"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
@@ -1431,7 +1431,7 @@ msgstr "Crea gruppo"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1443,7 +1443,7 @@ msgstr "Crea gruppo"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Annulla"
@@ -1680,7 +1680,7 @@ msgstr "Muovi telecamera"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Attrezzatura"
@@ -1847,8 +1847,8 @@ msgstr "Aggiungi tutti"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Magazzino"
@@ -1879,7 +1879,7 @@ msgstr "Salva tutto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Recupera"
@@ -1909,11 +1909,14 @@ msgstr "Ritira tutto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Usa"
@@ -2088,35 +2091,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Togli"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equipaggia"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Lascia..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Lascia tutto"
@@ -2124,56 +2108,56 @@ msgstr "Lascia tutto"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Lascia"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Dividi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Caccia"
@@ -3184,7 +3168,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4264,7 +4248,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Negozio"
@@ -5302,7 +5286,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Equipaggiamento"
@@ -5313,7 +5297,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventario"
@@ -5700,7 +5684,7 @@ msgstr "Cambia login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Gioca"
@@ -5877,11 +5861,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Togli"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equipaggia"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6690,36 +6701,36 @@ msgid "Name: %s"
msgstr "Nome: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Aggiornamento..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Connessione..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 L'aggiornamento è stato completato."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 È fortemente raccomandato"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 riprova più tardi"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Completato"
@@ -7571,43 +7582,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "senza nome"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
diff --git a/po/ja.po b/po/ja.po
index 0dbdb8971..4fe06bbfe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -25,12 +25,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "トレードリクエストを無効にしています"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "トレードリクエストを有効にしました"
@@ -470,31 +470,31 @@ msgid "Game modifiers are unknown"
msgstr "不明なゲームモディファイア"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "フォローを止める"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "真似をやめる"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -532,37 +532,37 @@ msgstr "吹出し"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "ビデオ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "テーマ"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "ヘルプ"
@@ -577,41 +577,41 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "閉じる"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
@@ -625,7 +625,7 @@ msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -638,37 +638,37 @@ msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "パスワードを変更しました"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "登録を解除しました"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう"
@@ -1428,7 +1428,7 @@ msgstr "パーティを作る"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1440,7 +1440,7 @@ msgstr "パーティを作る"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "キャンセル"
@@ -1677,7 +1677,7 @@ msgstr "カメラを動かす"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "服装"
@@ -1844,8 +1844,8 @@ msgstr "トレードウィンドウに全て追加する"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "保管"
@@ -1876,7 +1876,7 @@ msgstr "全部保存"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "取出す"
@@ -1906,11 +1906,14 @@ msgstr "全部取出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "使用"
@@ -2085,35 +2088,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "取外す"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "装着"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "落とす..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "全て落とす"
@@ -2121,56 +2105,56 @@ msgstr "全て落とす"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "落とす"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "分割"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "追い出す"
@@ -3181,7 +3165,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4261,7 +4245,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "店"
@@ -5293,7 +5277,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "装着品"
@@ -5304,7 +5288,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "インベントリー"
@@ -5691,7 +5675,7 @@ msgstr "別アカウントでログイン"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "プレイ"
@@ -5868,11 +5852,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "取外す"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "装着"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6679,36 +6690,36 @@ msgid "Name: %s"
msgstr "名前: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "更新しています..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "接続しています..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 アップデートは完了していません"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 する事を強く推奨します"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 しばらくたってからもう一度試してください"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "完了"
@@ -7557,43 +7568,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "名前なし"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "不明なアイテム"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 17d1d011c..3caa3d6ef 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: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+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,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr ""
@@ -465,31 +465,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -527,37 +527,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr ""
@@ -572,41 +572,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr ""
@@ -620,7 +620,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -633,37 +633,37 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr ""
@@ -1420,7 +1420,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,7 +1432,7 @@ msgstr ""
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr ""
@@ -1669,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr ""
@@ -1836,8 +1836,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr ""
@@ -1868,7 +1868,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr ""
@@ -1898,11 +1898,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr ""
@@ -2077,35 +2080,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr ""
@@ -2113,56 +2097,56 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr ""
@@ -3173,7 +3157,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4251,7 +4235,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr ""
@@ -5283,7 +5267,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr ""
@@ -5294,7 +5278,7 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr ""
@@ -5681,7 +5665,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
@@ -5858,11 +5842,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6669,36 +6680,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr ""
@@ -7540,43 +7551,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 3947d645b..b2e4dbf3d 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
@@ -468,31 +468,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Volgen onderbroken"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -530,37 +530,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Help"
@@ -575,41 +575,41 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -623,7 +623,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -636,37 +636,37 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
@@ -1426,7 +1426,7 @@ msgstr "Groep aanmaken"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1438,7 +1438,7 @@ msgstr "Groep aanmaken"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Annuleren"
@@ -1675,7 +1675,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Kleren"
@@ -1842,8 +1842,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Opslaan"
@@ -1874,7 +1874,7 @@ msgstr "Plaats alles"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Afhalen"
@@ -1904,11 +1904,14 @@ msgstr "Haal alles op"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Gebruiken"
@@ -2083,35 +2086,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Afdoen"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Uitrusten"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Neerleggen..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Laat alles vallen"
@@ -2119,56 +2103,56 @@ msgstr "Laat alles vallen"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Neerleggen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Splitsen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Ga naar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Schop"
@@ -3179,7 +3163,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4257,7 +4241,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Winkel"
@@ -5295,7 +5279,7 @@ msgstr "UITR"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Uitrusting"
@@ -5306,7 +5290,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventaris"
@@ -5693,7 +5677,7 @@ msgstr "Verwissel Login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spelen"
@@ -5870,11 +5854,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Afdoen"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Uitrusten"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6683,36 +6694,36 @@ msgid "Name: %s"
msgstr "Naam: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Actualiseren..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 probeer later opnieuw."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Voltooid"
@@ -7560,43 +7571,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Onbekend voorwerp"
diff --git a/po/pl.po b/po/pl.po
index 23fe9578a..925fc1974 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -25,12 +25,12 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorowanie przychodzących próśb o handel"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Akceptowanie przychodzących próśb o handel"
@@ -472,31 +472,31 @@ msgid "Game modifiers are unknown"
msgstr "Modyfikatory gry nieznane"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Podążanie: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Podążanie anulowane."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imitowanie: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitacja anulowana"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Widzisz %s"
@@ -534,37 +534,37 @@ msgstr "Bąbelek nad głową"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Konfiguracja"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Wydajność"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Ekran"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Skórka"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Pomoc"
@@ -579,41 +579,41 @@ msgstr "Pomoc"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Zamknij"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Zmiana serwera"
@@ -627,7 +627,7 @@ msgstr "Zmiana serwera"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -640,37 +640,37 @@ msgid "Error"
msgstr "Błąd"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
@@ -1428,7 +1428,7 @@ msgstr "Utwórz grupę"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1440,7 +1440,7 @@ msgstr "Utwórz grupę"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Anuluj"
@@ -1677,7 +1677,7 @@ msgstr "Przesuwaj kamerę"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Stroje"
@@ -1844,8 +1844,8 @@ msgstr "Dodaj wszystko do handlu"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Przechowaj"
@@ -1876,7 +1876,7 @@ msgstr "Przechowaj wszystko"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Pobierz"
@@ -1906,11 +1906,14 @@ msgstr "Odbierz wszystko"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Użyj"
@@ -2085,35 +2088,16 @@ msgid "Protect item"
msgstr "Chroń przedmiot"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Zdejmij"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Załóż"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Upuść..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Upuść wszystko"
@@ -2121,56 +2105,56 @@ msgstr "Upuść wszystko"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Upuść"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Podziel"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "Polecenia GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Sprawdź IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Idź do"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Przywołaj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Wskrześ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Wyrzuć"
@@ -3181,7 +3165,7 @@ msgstr "Poziom: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4261,7 +4245,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Sklep"
@@ -5298,7 +5282,7 @@ msgstr "EKW"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Ekwipunek"
@@ -5309,7 +5293,7 @@ msgstr "INW"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inwentarz"
@@ -5696,7 +5680,7 @@ msgstr "Przeloguj się"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Graj"
@@ -5878,11 +5862,38 @@ msgstr "Normalna czcionka"
msgid "Fonts"
msgstr "Czcionki"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Zdejmij"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Czy wiesz, że..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Załóż"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6693,36 +6704,36 @@ msgid "Name: %s"
msgstr "Imię: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Aktualizacja..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Łączenie..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Proces aktualizacji jest niekompletny."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Jest mocno zalecane abyś"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 Spróbuj ponownie później."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Zakończono"
@@ -7571,43 +7582,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nienazwany"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Atak %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Obrona %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "PŻ %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "PM %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Poziom %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Nieznany przedmiot"
diff --git a/po/pt.po b/po/pt.po
index dc9812a97..0a782bc08 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -23,12 +23,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
@@ -469,31 +469,31 @@ msgid "Game modifiers are unknown"
msgstr "Modificador de jogo desconhecido"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Seguir: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Seguir cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imitando: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitação cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Você vê %s"
@@ -531,37 +531,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Ajuda"
@@ -576,41 +576,41 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
@@ -624,7 +624,7 @@ msgstr "Mudando servidores do jogo"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -637,37 +637,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
@@ -1427,7 +1427,7 @@ msgstr "Criar grupo"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1439,7 +1439,7 @@ msgstr "Criar grupo"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Cancelar"
@@ -1676,7 +1676,7 @@ msgstr "Mover câmera"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Roupas"
@@ -1843,8 +1843,8 @@ msgstr "Add. todos na negociação"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Armazenar"
@@ -1875,7 +1875,7 @@ msgstr "Guardar tudo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Retirar"
@@ -1905,11 +1905,14 @@ msgstr "Retirar tudo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Usar"
@@ -2084,35 +2087,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Desequipar"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equipar"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Descartar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Descartar tudo"
@@ -2120,56 +2104,56 @@ msgstr "Descartar tudo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Descartar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Dividir"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Chutar"
@@ -3180,7 +3164,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4260,7 +4244,7 @@ msgstr "Habilitar notificações de peso"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Loja"
@@ -5296,7 +5280,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Equipamento"
@@ -5307,7 +5291,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventário"
@@ -5694,7 +5678,7 @@ msgstr "Trocar Login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jogar"
@@ -5876,11 +5860,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Desequipar"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Você Sabia..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equipar"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6688,36 +6699,36 @@ msgid "Name: %s"
msgstr "Nome: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Atualizando..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Concluído"
@@ -7572,43 +7583,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d70813d98..f99e92fbd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -30,12 +30,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
@@ -476,31 +476,31 @@ msgid "Game modifiers are unknown"
msgstr "Modificadores são desconhecidos"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Seguindo: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Seguindo cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Imitando: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Imitação cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Você vê %s"
@@ -538,37 +538,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Performance"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr "Sobre"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Ajuda"
@@ -583,41 +583,41 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
@@ -631,7 +631,7 @@ msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -644,37 +644,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
@@ -1434,7 +1434,7 @@ msgstr "Criar grupo"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1446,7 +1446,7 @@ msgstr "Criar grupo"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Cancelar"
@@ -1683,7 +1683,7 @@ msgstr "Mover câmera "
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Roupas"
@@ -1850,8 +1850,8 @@ msgstr "Add. todos na negociação"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Armazenar"
@@ -1882,7 +1882,7 @@ msgstr "Guardar tudo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Retirar"
@@ -1912,11 +1912,14 @@ msgstr "Retirar tudo"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Usar"
@@ -2091,35 +2094,16 @@ msgid "Protect item"
msgstr "Proteger item"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Desequipar"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equipar"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Descartar..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Descartar tudo"
@@ -2127,56 +2111,56 @@ msgstr "Descartar tudo"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Descartar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Dividir"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "Comandos de GM"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Checar ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Ir à"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Trazer jogador"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Reviver"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Chutar"
@@ -3187,7 +3171,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4267,7 +4251,7 @@ msgstr "Habilitar notificações de peso"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Loja"
@@ -5303,7 +5287,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Equipamento"
@@ -5314,7 +5298,7 @@ msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Inventário"
@@ -5701,7 +5685,7 @@ msgstr "Trocar Login"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jogar"
@@ -5883,11 +5867,38 @@ msgstr "Fonte normal"
msgid "Fonts"
msgstr "Fontes"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Desequipar"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Você sabia que ..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equipar"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6695,36 +6706,36 @@ msgid "Name: %s"
msgstr "Nome: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Atualizando..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr "Mostrar todas as noticias (pode ser lento)"
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Concluído"
@@ -7578,43 +7589,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Ataque %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Defesa %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "HP %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "MP %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Nível %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/ru.po b/po/ru.po
index 67cff469d..9020a46a0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 10:24+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -28,12 +28,12 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
@@ -475,31 +475,31 @@ msgid "Game modifiers are unknown"
msgstr "Игровые модификаторы в неизвестном положении"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -537,37 +537,37 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr "Производительность"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr "О Программе"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Помощь"
@@ -582,41 +582,41 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -630,7 +630,7 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -643,37 +643,37 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Регистрация удалена"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
@@ -1434,7 +1434,7 @@ msgstr "Создать группу"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1446,7 +1446,7 @@ msgstr "Создать группу"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "Отмена"
@@ -1683,7 +1683,7 @@ msgstr "Передвинуть камеру"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Наряды"
@@ -1850,8 +1850,8 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Сохранить"
@@ -1882,7 +1882,7 @@ msgstr "Сохранить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Получить"
@@ -1912,11 +1912,14 @@ msgstr "Получить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Использовать"
@@ -2091,35 +2094,16 @@ msgid "Protect item"
msgstr "Поставить защиту"
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Снять"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Надеть"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Бросить..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "Бросить все"
@@ -2127,56 +2111,56 @@ msgstr "Бросить все"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Разделить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr "ГМ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr "Коменды ГМ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr "Проверить IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr "Перейти"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr "Вызвать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr "Оживить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr "Кикнуть"
@@ -3187,7 +3171,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4267,7 +4251,7 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Магазин"
@@ -5311,7 +5295,7 @@ msgstr "СН"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Снаряжение"
@@ -5322,7 +5306,7 @@ msgstr "ИНВ"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Инвентарь"
@@ -5709,7 +5693,7 @@ msgstr "Сменить героя"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Играть"
@@ -5891,11 +5875,38 @@ msgstr "Нормальный шрифт"
msgid "Fonts"
msgstr "Шрифты"
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Снять"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr "Знаете ли вы..."
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Надеть"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6706,36 +6717,36 @@ msgid "Name: %s"
msgstr "Имя: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Обновление..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Соединение..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr "Показать все новости (может быть медленным)"
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Процесс обновления не завершен."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Завершено"
@@ -7586,43 +7597,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "безымянный"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr "Атака %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr "Защита %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr "Жизнь %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr "Мана %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr "Уровень: %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Неизвестный предмет"
diff --git a/po/tr.po b/po/tr.po
index 4215ff8e6..0d4284618 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "Gelen takas istekleri görmezden geliniyor."
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "Gelen takas istekleri kabul ediliyor"
@@ -468,31 +468,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr "Taklit iptal edildi"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -530,37 +530,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Ayarlar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "Yardım"
@@ -575,41 +575,41 @@ msgstr "Yardım"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "Kapat"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "Bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "Bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "Oyun sunucusu değiştiriliyor"
@@ -623,7 +623,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -636,37 +636,37 @@ msgid "Error"
msgstr "Hata"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "Şifre Değiştir"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "E-posta Değiştir"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "Hesap kapatma başarılı"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
@@ -1426,7 +1426,7 @@ msgstr "Grup kur"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1438,7 +1438,7 @@ msgstr "Grup kur"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "İptal"
@@ -1675,7 +1675,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "Kıyafetler"
@@ -1842,8 +1842,8 @@ msgstr "Tamamını takasa ekle"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Sakla"
@@ -1874,7 +1874,7 @@ msgstr "Tamamını sakla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "Almak"
@@ -1904,11 +1904,14 @@ msgstr "Tamamını geri al"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "Kullan"
@@ -2083,35 +2086,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Çıkar"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Donatmak"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "Bırak..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr ""
@@ -2119,56 +2103,56 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "Bırak"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "Bölme"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr ""
@@ -3179,7 +3163,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4260,7 +4244,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "Mağaza"
@@ -5292,7 +5276,7 @@ msgstr "EKP"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "Ekipman"
@@ -5303,7 +5287,7 @@ msgstr "ENV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "Envanter"
@@ -5690,7 +5674,7 @@ msgstr "Hesap Değiştir"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Oyna"
@@ -5867,11 +5851,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Çıkar"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Donatmak"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6680,36 +6691,36 @@ msgid "Name: %s"
msgstr "İsim: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "Güncelleniyor..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "Bağlanıyor..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 Güncelleme işlemi tamamlanamadı."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 Şiddetle tavsiye edilir ki"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr "##1 daha sonra tekrar deneyiniz."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "Tamamlandı"
@@ -7551,43 +7562,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "isimsiz"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "Bilinmeyen nesne"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 540b4f027..387f1e7a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-29 02:02+0300\n"
+"POT-Creation-Date: 2014-07-05 00:21+0300\n"
"PO-Revision-Date: 2014-06-27 09:41+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -24,12 +24,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
msgid "Ignoring incoming trade requests"
msgstr "忽略新进的交易请求"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
@@ -469,31 +469,31 @@ msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3334
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3340 src/being/localplayer.cpp:3365
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3350
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3356 src/being/localplayer.cpp:3370
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3716
#, c-format
msgid "You see %s"
msgstr ""
@@ -531,37 +531,37 @@ msgstr "流动的泡沫"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:914 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:917 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:920 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
msgid "Video"
msgstr "视频"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "主题"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:926
+#: src/client.cpp:927
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:929 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
#: src/gui/windows/helpwindow.cpp:52
msgid "Help"
msgstr "帮助"
@@ -576,41 +576,41 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:933 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
#: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
#: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1057
+#: src/client.cpp:1058
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1105
+#: src/client.cpp:1106
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1148
+#: src/client.cpp:1149
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1272
+#: src/client.cpp:1273
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1312
+#: src/client.cpp:1313
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1324
+#: src/client.cpp:1325
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
@@ -624,7 +624,7 @@ msgstr "正在更改游戏服务器"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1379 src/client.cpp:1390 src/client.cpp:1576
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:158
#: src/gui/windows/charcreatedialog.cpp:358
@@ -637,37 +637,37 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1402
+#: src/client.cpp:1403
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1443
+#: src/client.cpp:1444
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1445
+#: src/client.cpp:1446
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1468
+#: src/client.cpp:1469
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1470
+#: src/client.cpp:1471
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1493
+#: src/client.cpp:1494
msgid "Unregister Successful"
msgstr "取消注册成功"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1495
+#: src/client.cpp:1496
msgid "Farewell, come back any time..."
msgstr "再见,欢迎随时回来... ..."
@@ -1424,7 +1424,7 @@ msgstr "建立"
#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
#: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:57
#: src/gui/windows/changepassworddialog.cpp:59
@@ -1436,7 +1436,7 @@ msgstr "建立"
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
msgid "Cancel"
msgstr "取消"
@@ -1673,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
#: src/gui/windows/outfitwindow.cpp:56
msgid "Outfits"
msgstr "套装"
@@ -1840,8 +1840,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "存储"
@@ -1872,7 +1872,7 @@ msgstr "商店所有"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
msgid "Retrieve"
msgstr "取回"
@@ -1902,11 +1902,14 @@ msgstr "检索所有"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
msgid "Use"
msgstr "使用"
@@ -2081,35 +2084,16 @@ msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "卸下装备"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "装备"
-
-#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
msgid "Drop..."
msgstr "掉落... ..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
msgid "Drop all"
msgstr "所有"
@@ -2117,56 +2101,56 @@ msgstr "所有"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
msgid "Drop"
msgstr "丢弃"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
msgid "Split"
msgstr "分离"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
msgid "Kick"
msgstr ""
@@ -3177,7 +3161,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
#, c-format
msgid "Money: %s"
@@ -4255,7 +4239,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
msgid "Shop"
msgstr "商店"
@@ -5287,7 +5271,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Equipment"
msgstr "装备"
@@ -5298,7 +5282,7 @@ msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
#: src/inventory.cpp:262
msgid "Inventory"
msgstr "物品栏"
@@ -5685,7 +5669,7 @@ msgstr "登录"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
#: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "开始"
@@ -5862,11 +5846,38 @@ msgstr ""
msgid "Fonts"
msgstr ""
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "卸下装备"
+
#. TRANSLATORS: help window. button.
#: src/gui/windows/helpwindow.cpp:55
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: 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 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "装备"
+
#. TRANSLATORS: item amount window button
#: src/gui/windows/itemamountwindow.cpp:168
msgid "All"
@@ -6671,36 +6682,36 @@ msgid "Name: %s"
msgstr "姓名:%s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
msgid "Updating..."
msgstr "更新..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
msgid "Connecting..."
msgstr "连接中..."
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
msgid "##1 The update process is incomplete."
msgstr "##1 更新过程不完整。"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
msgid "Completed"
msgstr "已完成"
@@ -7544,43 +7555,43 @@ 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:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:320 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知怪兽"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#: src/resources/db/itemdb.cpp:98
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:196
msgid "Unknown item"
msgstr "未知物品"