Update translations.

24 files changed, 1764 insertions, 1497 deletions

diff --git a/po/ca.po b/po/ca.po
index 173f491a2..de99cd011 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -33,7 +33,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -557,41 +557,41 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Ajuda"
@@ -612,7 +612,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -625,32 +625,32 @@ msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -666,7 +666,7 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -680,27 +680,27 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
@@ -1835,29 +1835,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Pes: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opcions:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Intercanvi"
 
@@ -2848,14 +2854,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventari"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Emmagatzematge"
 
@@ -2866,7 +2872,7 @@ msgstr "Emmagatzematge"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Motxilla"
 
@@ -3234,7 +3240,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5273,82 +5279,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6296,7 +6307,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7749,19 +7760,19 @@ msgid "You give:"
 msgstr "Ofereixes:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "No tens diners suficients."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus "
 "d'objecte a la finestra."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9155,7 +9166,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Error desconegut."
 
@@ -9459,7 +9470,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9467,23 +9478,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Objecte desconegut"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Antiga contrasenya incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9605,13 +9616,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9756,8 +9767,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9809,7 +9820,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 0cdf1d731..090718a69 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
@@ -38,7 +38,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -562,41 +562,41 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Nápověda"
@@ -617,7 +617,7 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -630,32 +630,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -671,7 +671,7 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -685,27 +685,27 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
@@ -1842,29 +1842,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Nastavení:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Obchod"
 
@@ -2855,14 +2861,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventář"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Sklad"
 
@@ -2873,7 +2879,7 @@ msgstr "Sklad"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Košík"
 
@@ -3241,7 +3247,7 @@ msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5282,85 +5288,90 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Lepší kvalita (vypněte pro lepší výkon)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Povolit opravu průhlednosti (Softwarově, může být velmi pomalé)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Zobrazit objekty průhledné"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Povolit změnu řazení obrázků (potřebné pro podporu modů)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Málo paměti (zapněte pro nízké využití paměti)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Zákázat pokročilé načítání objektů do paměti (Softwarově)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Zakázat načítání oběktů do pamětu (Softwarově)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr "Různá nastavení (povolení nebo vypnutí pro lepší výkon)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Povolit kompresy textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Povolit rozšíření čtvercové textury (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Požít nový vnitřní formát textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Zapni atlasy textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 "Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více "
 "paměti)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 "Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr "Nebezpečná nastavení (NEMĚŇ pokud nevíš co děláš)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Zakázat záznam ve hře (nepovolit)"
 
@@ -6308,7 +6319,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7768,17 +7779,17 @@ msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9178,7 +9189,7 @@ msgstr "Uživatelské jméno bylo trvale odstraněno."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
@@ -9482,7 +9493,7 @@ msgid "Guild castle: %s"
 msgstr "Hrad gildy: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9490,23 +9501,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Účet nenalezen, prosím přihlaste se znovu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Půvoní heslo je nesprávné."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
@@ -9628,13 +9639,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9779,8 +9790,8 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9832,7 +9843,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 21946cb1c..327946459 100644
--- a/po/de.po
+++ b/po/de.po
@@ -41,8 +41,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
@@ -65,7 +65,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -592,41 +592,41 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Hilfe"
@@ -647,7 +647,7 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -660,32 +660,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -701,7 +701,7 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -715,27 +715,27 @@ msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
@@ -1879,29 +1879,35 @@ msgid "Particles: %u"
 msgstr "Partikel: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Objektname: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Karten: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Optionen:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Handeln"
 
@@ -2892,14 +2898,14 @@ msgstr "Status"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Lager"
 
@@ -2910,7 +2916,7 @@ msgstr "Lager"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Einkaufswagen"
 
@@ -3278,7 +3284,7 @@ msgstr "Fenster"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Handwerk"
 
@@ -5454,87 +5460,93 @@ msgid "Enable OpenGL context creation"
 msgstr "ObenGL Kontext-Erstellung aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#, fuzzy
+msgid "Enable OpenGL direct state access"
+msgstr "ObenGL Kontext-Erstellung aktivieren"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Bessere Qualität (Für bessere Leistung deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Alphakanalberichtigung aktiveren (Software, kann sehr langsam sein)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Transparenz von Wesen anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Neuordnung der Sprites aktivieren (Für Mod-Unterstützung benötigt)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Kleiner Speicher (aktiviere für niedrigere Speichernutzung)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Erweiterten Zwischenspeicher für Wesen aktivieren (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Zwischenspeicher für Wesen deaktivieren (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung "
 "verbessern)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Textur-Komprimierung aktivieren (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Erweiterung rechteckiger Texturen aktiveren (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Neues internes Texturenformat benutzen (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Texturenatlas aktiveren (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 "Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher "
 "verbrauchen)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 "Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr "Kritische Optionen (NICHT ändern, wenn du nicht weißt, was du tust)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Aufzeichnen im Spiel deaktivieren (Nicht aktivieren)"
 
@@ -6485,7 +6497,7 @@ msgstr "NA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Nachricht"
 
@@ -7943,19 +7955,19 @@ msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten "
@@ -9360,7 +9372,7 @@ msgstr "Benutzername für immer gelöscht."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -9664,7 +9676,7 @@ msgid "Guild castle: %s"
 msgstr "Gildenburg: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
@@ -9672,23 +9684,23 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Altes Passwort falsch."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
@@ -9810,13 +9822,13 @@ msgid "Select warp target"
 msgstr "Warp Ziel auswählen"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Gegenstand %s in Anzahl %d verkauft. Du bekommst: %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "Gegenstand %s in Anzahl %d verkauft"
@@ -9961,8 +9973,8 @@ msgstr "Modernes OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -10014,7 +10026,7 @@ msgid "Extended"
 msgstr "erweitert"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "NPC"
 
diff --git a/po/eo.po b/po/eo.po
index aef677a1e..380c39608 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-04-05 17:11+0000\n"
-"Last-Translator: Fendo <fendo@posteo.ru>\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 11:49+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
 "eo/)\n"
 "Language: eo\n"
@@ -34,7 +34,7 @@ msgstr "Dosiero alŝutita"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -194,7 +194,7 @@ msgstr "Gilda avizo"
 #: src/actions/chat.cpp:709
 #, c-format
 msgid "No translation found for string: %s"
-msgstr ""
+msgstr "Nenia traduko trovita por ĉeno: %s"
 
 #. TRANSLATORS: change relation
 #: src/actions/commands.cpp:139
@@ -559,41 +559,41 @@ msgstr "Glita bobelo"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Agordoj"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Etoso"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Pri"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Helpo"
@@ -614,7 +614,7 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -627,32 +627,32 @@ msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Konektanta al servilo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Ensalutanta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Eniranta ludan mondon"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Petanta avatarojn"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Konektanta al la luda servilo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Ŝanĝanta ludajn servilojn"
 
@@ -668,7 +668,7 @@ msgstr "Ŝanĝanta ludajn servilojn"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -682,27 +682,27 @@ msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Petanta detalojn de registrado"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Ŝanĝo de Pasvorto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Sukcese ŝanĝis pasvorton!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Ŝanĝo de Retpoŝtadreso"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Sukcese ŝanĝis retpoŝtadreson!"
 
@@ -1839,29 +1839,35 @@ msgid "Particles: %u"
 msgstr "Partikloj: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Pezo: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Objekto nomita: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Kartoj: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Agordoj:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Negoco"
 
@@ -2852,14 +2858,14 @@ msgstr "Atributoj"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Objektujo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Deponejo"
 
@@ -2870,7 +2876,7 @@ msgstr "Deponejo"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Ĉaro"
 
@@ -3238,7 +3244,7 @@ msgstr "Fenestroj"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Metio"
 
@@ -5394,82 +5400,88 @@ msgid "Enable OpenGL context creation"
 msgstr "Ŝalti kreon de kunteksto de OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#, fuzzy
+msgid "Enable OpenGL direct state access"
+msgstr "Ŝalti kreon de kunteksto de OpenGL"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Pli bona kvalito (malŝalti por pli bona rendimento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Ŝalti ĝustigon de alfa kanalo (Programa, povas esti tre malrapida)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Montri travideblecon de estaĵoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Ŝalti reordigadon de bildoj (necesa por subteno de modifikoj)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Malmulta memoro (ŝalti por pli malgranda uzo de memoro)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Malŝalti specialan kaŝmemorigadon de estaĵoj (Programa)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Malŝalti kaŝmemorigadon de estaĵoj (Programa)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr "Diversaj agordoj (ŝalti aŭ malŝalti povas plibonigi rendimenton)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Ŝalti densigon de teksturoj (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Ŝalti ortangulan teksturan kromprogramon (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Uzi novan internan teksturan formon (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ŝalti teksturajn maparojn (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr "Kaŝmemorigi ĉiujn bildojn en mapo (povas uzi pli da memoro)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Kaŝmemorigi ĉiujn sonojn (povas uzi pli da memoro)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr "Krizaj agordoj (NE ŝanĝu se vi ne bone scias ilin)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Malŝalti protokoladon en ludo (ne ŝaltu)"
 
@@ -6418,7 +6430,7 @@ msgstr "POŜ"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Poŝto"
 
@@ -6885,7 +6897,7 @@ msgstr "Elektu ovon"
 #. TRANSLATORS: input action name
 #: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:91
 msgid "Select"
-msgstr "Elektu"
+msgstr "Elekti"
 
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:53
@@ -6900,7 +6912,7 @@ msgstr "Tiparoj"
 #. TRANSLATORS: emotes tab name
 #: src/gui/windows/emotewindow.cpp:136
 msgid "T"
-msgstr ""
+msgstr "M"
 
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
@@ -7876,19 +7888,19 @@ msgid "You give:"
 msgstr "Vi donas:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Vi ne havas sufiĉe da mono."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Malsukcesis aldoni objekton. Vi ne povas sinkovri unu specon de objekto sur "
 "la fenestron."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "Malsukcesis aldoni objekton. Vi ne povas transdoni surhavatajn objektojn."
@@ -9288,7 +9300,7 @@ msgstr "Uzantnomo daŭre forigita."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
@@ -9592,7 +9604,7 @@ msgid "Guild castle: %s"
 msgstr "Gilda kastelo: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Restas %s luotempo por objekto %s."
@@ -9600,23 +9612,23 @@ msgstr "Restas %s luotempo por objekto %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Nekonata objekto"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Konto ne trovita. Bonvolu resaluti."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Malnova pasvorto malĝusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nova pasvorto estas tro mallonga."
 
@@ -9738,13 +9750,13 @@ msgid "Select warp target"
 msgstr "Elekti varpan celon"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Vendis %s nombro %d. Vi ricevis: %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "Vendis %s nombro %d"
@@ -9889,8 +9901,8 @@ msgstr "Moderna OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9942,7 +9954,7 @@ msgid "Extended"
 msgstr "Etendita"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "Nla"
 
diff --git a/po/es.po b/po/es.po
index b181577a2..569e0b4a4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 22:53+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-19 19:54+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
@@ -53,7 +53,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -214,7 +214,7 @@ msgstr "Nota del gremio"
 #: src/actions/chat.cpp:709
 #, c-format
 msgid "No translation found for string: %s"
-msgstr ""
+msgstr "No se encontró traducción para la cadena: %s"
 
 #. TRANSLATORS: change relation
 #: src/actions/commands.cpp:139
@@ -579,41 +579,41 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Ayuda"
@@ -634,7 +634,7 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -647,32 +647,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -688,7 +688,7 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -702,27 +702,27 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
@@ -1863,29 +1863,35 @@ msgid "Particles: %u"
 msgstr "Partículas: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Artículo nombrado: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Tarjetas: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opciones:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Intercambio"
 
@@ -2876,14 +2882,14 @@ msgstr "Atributos"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Almacenamiento"
 
@@ -2894,7 +2900,7 @@ msgstr "Almacenamiento"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Mochila"
 
@@ -3262,7 +3268,7 @@ msgstr "Ventanas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Trabajo"
 
@@ -5440,84 +5446,90 @@ msgid "Enable OpenGL context creation"
 msgstr "Habilitar creación de contexto OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#, fuzzy
+msgid "Enable OpenGL direct state access"
+msgstr "Habilitar creación de contexto OpenGL"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Mejor calidad (deshabilitar para un mejor desempeño)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia de criaturas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Habilitar re-ordenamiento de sprites (necesario para soporte de mods)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Poca memoria (permite un uso más bajo de memoria)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Deshabilitar caché avanzado de criaturas (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Deshabilitar caché de criaturas (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Habilitar compresión de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar extensiones de textura rectangulares (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usar nuevo formato de textura interna (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Habilitar atlas de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 "Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Almacenar en caché todos los sonidos (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr "Opciones críticas (NO las cambies si no sabes lo que estás haciendo)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Deshabilitar registro en el juego (no habilitar)"
 
@@ -6467,7 +6479,7 @@ msgstr "MA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Correo"
 
@@ -6954,7 +6966,7 @@ msgstr "Fuentes"
 #. TRANSLATORS: emotes tab name
 #: src/gui/windows/emotewindow.cpp:136
 msgid "T"
-msgstr ""
+msgstr "T"
 
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
@@ -7932,19 +7944,19 @@ msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Fallo al agregar artículo. No puedes intercambiar artículos equipados."
 
@@ -9348,7 +9360,7 @@ msgstr "Nombre de usuario borrado permanentemente."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -9652,7 +9664,7 @@ msgid "Guild castle: %s"
 msgstr "Castillo del gremio: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Falta %s de tiempo de renta para el artículo %s."
@@ -9660,23 +9672,23 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Contraseña anterior incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
@@ -9798,13 +9810,13 @@ msgid "Select warp target"
 msgstr "Seleccionar portal objetivo"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Artículo vendido: %s. Cantidad: %d. Obtuviste: %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "Artículo %s vendido, en cantidad de %d"
@@ -9949,8 +9961,8 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -10002,7 +10014,7 @@ msgid "Extended"
 msgstr "Extendido"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "Npc"
 
diff --git a/po/fi.po b/po/fi.po
index 2e6574178..1760d3643 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -556,41 +556,41 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Apua"
@@ -611,7 +611,7 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -624,32 +624,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -665,7 +665,7 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -679,27 +679,27 @@ msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
@@ -1835,29 +1835,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Asetusvivut:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Tee kaupat"
 
@@ -2848,14 +2854,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Varasto"
 
@@ -2866,7 +2872,7 @@ msgstr "Varasto"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Kärry"
 
@@ -3234,7 +3240,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5273,82 +5279,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Näytä olioiden läpinäkyvyys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Pieni muisti, käytä vähemmän muistia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6292,7 +6303,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7745,17 +7756,17 @@ msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9152,7 +9163,7 @@ msgstr "Käyttäjänimi pysyvästi poistettu."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -9456,7 +9467,7 @@ msgid "Guild castle: %s"
 msgstr "Killan linna: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9464,23 +9475,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Vanha salsana on väärä."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
@@ -9602,13 +9613,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9753,8 +9764,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9806,7 +9817,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 63ad9bd9f..74bbeb783 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# adrien vigneron <adrienvigneron@ml1.net>, 2016
+# adrien vigneron <adrienvigneron@ml1.net>, 2016-2017
 # Alige, 2013-2017
 # Alige, 2012-2013
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 13:14+0000\n"
-"Last-Translator: Alige\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-17 10:16+0000\n"
+"Last-Translator: adrien vigneron <adrienvigneron@ml1.net>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -51,7 +51,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -214,7 +214,7 @@ msgstr "Notice de guilde"
 #: src/actions/chat.cpp:709
 #, c-format
 msgid "No translation found for string: %s"
-msgstr ""
+msgstr "Aucune traduction trouvée pour cette chaîne: %s"
 
 #. TRANSLATORS: change relation
 #: src/actions/commands.cpp:139
@@ -579,41 +579,41 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Aide"
@@ -634,7 +634,7 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -647,32 +647,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -688,7 +688,7 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -702,27 +702,27 @@ msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Modification de l'adresse mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "L'adresse mail a été changée avec succès !"
 
@@ -1870,29 +1870,35 @@ msgid "Particles: %u"
 msgstr "Particules : %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Nom d'objet : %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Cartes : "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Options :"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Échange"
 
@@ -2883,14 +2889,14 @@ msgstr "Statistiques"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventaire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Entrepôt"
 
@@ -2901,7 +2907,7 @@ msgstr "Entrepôt"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Panier"
 
@@ -3269,7 +3275,7 @@ msgstr "Fenêtres"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Artisanat"
 
@@ -5455,88 +5461,94 @@ msgid "Enable OpenGL context creation"
 msgstr "Activer la création de contexte OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#, fuzzy
+msgid "Enable OpenGL direct state access"
+msgstr "Activer la création de contexte OpenGL"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Afficher les créatures en transparence"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Activer sprites de réapprovisionnement (nécessaire pour les mods)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Petite mémoire (autoriser pour une utilisation moindre de la mémoire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Désactiver la mise en cache des créatures avancées (logiciel)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Désactiver la mise en cache des créatures"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Différentes options (activer ou désactiver peut améliorer les performances)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Activer la compression des textures (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Activer l'extension de texture rectangulaire (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Utiliser le nouveau format interne de texture  (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Activer les atlas de textures (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 "Mettre en cache tous les sprites par carte (peut utiliser de la mémoire "
 "supplémentaire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Mettre tous les sons en cache (peut utiliser plus de mémoire)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 "Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de "
 "faire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Désactiver l'entrée en jeu (ne pas activer)"
 
@@ -6489,7 +6501,7 @@ msgstr "MA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Mail"
 
@@ -6971,7 +6983,7 @@ msgstr "Polices d'écriture"
 #. TRANSLATORS: emotes tab name
 #: src/gui/windows/emotewindow.cpp:136
 msgid "T"
-msgstr ""
+msgstr "T"
 
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
@@ -7951,19 +7963,19 @@ msgid "You give:"
 msgstr "Tu donnes :"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Tu n'as pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même "
 "objet dans cette fenêtre."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu "
@@ -9369,7 +9381,7 @@ msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
@@ -9673,7 +9685,7 @@ msgid "Guild castle: %s"
 msgstr "Château de la guilde : %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Il reste %s de temps restant pour l'emprunt de l'objet %s."
@@ -9681,23 +9693,23 @@ msgstr "Il reste %s de temps restant pour l'emprunt de l'objet %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectes-toi s'il-te-plaît."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Ancien mot de passe incorrect."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
@@ -9819,13 +9831,13 @@ msgid "Select warp target"
 msgstr "Sélectionner la cible de téléportation"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Vendu objet %s quantité %d. Tu as : %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "Vendu objet %s quantité %d."
@@ -9970,8 +9982,8 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -10023,7 +10035,7 @@ msgid "Extended"
 msgstr "Prolongé"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "Npc"
 
diff --git a/po/id.po b/po/id.po
index 08bbf021e..73284ea44 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -37,7 +37,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -560,41 +560,41 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Bantuan"
@@ -615,7 +615,7 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -628,32 +628,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -669,7 +669,7 @@ msgstr "Mengganti server"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -683,27 +683,27 @@ msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
@@ -1839,29 +1839,34 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+msgid "Options: "
+msgstr ""
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Dagang"
 
@@ -2852,14 +2857,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Perbekalan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Tempat penyimpanan"
 
@@ -2870,7 +2875,7 @@ msgstr "Tempat penyimpanan"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3238,7 +3243,7 @@ msgstr "Jendela"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5275,82 +5280,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6293,7 +6303,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7744,17 +7754,17 @@ msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9148,7 +9158,7 @@ msgstr "Username dihapus permanen."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr ""
 
@@ -9452,7 +9462,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9460,23 +9470,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9598,13 +9608,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9749,8 +9759,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9802,7 +9812,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 2ea940846..970c858bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-04-08 10:50+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-25 12:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -43,7 +43,7 @@ msgstr "File caricato"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -567,41 +567,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Info"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Aiuto"
@@ -622,7 +622,7 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -635,32 +635,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -676,7 +676,7 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -690,27 +690,27 @@ msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
@@ -1851,29 +1851,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opzioni:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Commercia"
 
@@ -2864,14 +2870,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Magazzino"
 
@@ -2882,7 +2888,7 @@ msgstr "Magazzino"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Carrello"
 
@@ -3250,7 +3256,7 @@ msgstr "Finestre"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Craft"
 
@@ -5289,82 +5295,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Abilita fix del canale alpha (Software, può rallentare il gioco)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Mostra trasparenza personaggi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Modalità Poca Memoria (abilita per usare meno memoria)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Abilita estenzione texture rettangolari (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usa nuovo formato texture interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Attiva raggruppamento texture (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6313,7 +6324,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7771,19 +7782,19 @@ msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
 "finestra."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9181,7 +9192,7 @@ msgstr "Username cancellato permanentemente."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
@@ -9485,7 +9496,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9493,23 +9504,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "L'account non è stato trovato. Per favore effettua un nuovo login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "La vecchia password è sbagliata."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
@@ -9631,13 +9642,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9782,8 +9793,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9835,7 +9846,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index def82b6b4..b459b057c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -38,7 +38,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -560,41 +560,41 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "ヘルプ"
@@ -615,7 +615,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -628,32 +628,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -669,7 +669,7 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -683,27 +683,27 @@ msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
@@ -1841,29 +1841,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "オプション:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "トレード"
 
@@ -2854,14 +2860,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "インベントリー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "倉庫"
 
@@ -2872,7 +2878,7 @@ msgstr "倉庫"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "カート"
 
@@ -3240,7 +3246,7 @@ msgstr "ウィンドウ"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "クラフト"
 
@@ -5279,82 +5285,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "アルファチャンネル修正を有効化 (ソフトウェア-重くなる可能性があります)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "透過を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "メモリ優先 (メモリ使用を少なくするには有効にして下さい)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "アドバンスキャッシュを無効にする (ソフトウェア)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "キャッシュを無効にする (ソフトウェア)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6297,7 +6308,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7748,19 +7759,19 @@ msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
 "加することは出来ません."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9158,7 +9169,7 @@ msgstr "ユーザーネームは永久に削除されました."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "不明なエラー."
 
@@ -9462,7 +9473,7 @@ msgid "Guild castle: %s"
 msgstr "ギルド城: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9470,23 +9481,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "アカウントが見つかりませんでした。再度ログインして下さい."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "変更前のパスワードが間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません."
 
@@ -9608,13 +9619,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9759,8 +9770,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9812,7 +9823,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 00b0f393d..989a561dc 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: 2017-04-15 18:28+0300\n"
+"POT-Creation-Date: 2017-04-27 17:58+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"
@@ -31,7 +31,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -554,41 +554,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr ""
@@ -609,7 +609,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -622,32 +622,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -677,27 +677,27 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr ""
 
@@ -1832,29 +1832,34 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+msgid "Options: "
+msgstr ""
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr ""
 
@@ -2845,14 +2850,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2863,7 +2868,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3231,7 +3236,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5268,82 +5273,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6286,7 +6296,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7739,17 +7749,17 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9143,7 +9153,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr ""
 
@@ -9447,7 +9457,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9455,23 +9465,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9593,13 +9603,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9744,8 +9754,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9797,7 +9807,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 6421f9b02..6ac43ab80 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -35,7 +35,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -558,41 +558,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Help"
@@ -613,7 +613,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -626,32 +626,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -667,7 +667,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -681,27 +681,27 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
@@ -1838,29 +1838,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opties:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Handel"
 
@@ -2851,14 +2857,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2869,7 +2875,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Winkelkar"
 
@@ -3237,7 +3243,7 @@ msgstr "Vensters"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Creëer"
 
@@ -5274,82 +5280,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6298,7 +6309,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7751,19 +7762,19 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9161,7 +9172,7 @@ msgstr "Gebruikersnaam is compleet verwijderd."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
@@ -9465,7 +9476,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9473,23 +9484,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
@@ -9611,13 +9622,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9762,8 +9773,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9815,7 +9826,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 6421f9b02..6ac43ab80 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -35,7 +35,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -558,41 +558,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Help"
@@ -613,7 +613,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -626,32 +626,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -667,7 +667,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -681,27 +681,27 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
@@ -1838,29 +1838,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opties:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Handel"
 
@@ -2851,14 +2857,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2869,7 +2875,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Winkelkar"
 
@@ -3237,7 +3243,7 @@ msgstr "Vensters"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Creëer"
 
@@ -5274,82 +5280,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6298,7 +6309,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7751,19 +7762,19 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9161,7 +9172,7 @@ msgstr "Gebruikersnaam is compleet verwijderd."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
@@ -9465,7 +9476,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9473,23 +9484,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
@@ -9611,13 +9622,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9762,8 +9773,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9815,7 +9826,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 53655819a..4fec60493 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -568,41 +568,41 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Pomoc"
@@ -623,7 +623,7 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -636,32 +636,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -677,7 +677,7 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -691,27 +691,27 @@ msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
@@ -1849,29 +1849,35 @@ msgid "Particles: %u"
 msgstr "Cząsteczki: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Przedmiot nazwany: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Karty: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opcje:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Handel"
 
@@ -2862,14 +2868,14 @@ msgstr "Statystyki"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Magazyn"
 
@@ -2880,7 +2886,7 @@ msgstr "Magazyn"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Wózek"
 
@@ -3248,7 +3254,7 @@ msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Rzemiosło"
 
@@ -5287,82 +5293,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Lepsza jakość (wyłącz dla lepszej wydajności)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Napraw kanał alfa (Software, może bardzo spowolniać)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Pokaż przezroczystość istot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Włącz reorganizację obrazków (potrzebne dla wsparcia modów)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Zmniejszenie zużycia pamięci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Wyłącz zaawansowany cache istot (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Wyłącz cache istot (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr "Różne opcje (włączenie lub wyłączenie może poprawić wydajność)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Włącz kompresję tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Włącz roszerzenie prostokątnych tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Użuj nowy wewnętrzny format tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktywuj atlasy tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr "Umieszczaj w cache wszystkie sprite'y mapy (może zużyć więcej pamięci)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Umieszczaj w cache wszystkie dźwięki (może zużyć więcej pamięci)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6312,7 +6323,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7774,19 +7785,19 @@ msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9182,7 +9193,7 @@ msgstr "Login pernamentnie usunięty."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
@@ -9486,7 +9497,7 @@ msgid "Guild castle: %s"
 msgstr "Zamek gildii: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9494,23 +9505,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Konto nie znalezione. Prosimy się przelogować."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Stare hasło nieprawidłowe."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
@@ -9632,13 +9643,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9783,8 +9794,8 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9836,7 +9847,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index db7ec9002..5e8f469e7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -37,7 +37,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -560,41 +560,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Ajuda"
@@ -615,7 +615,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -628,32 +628,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -669,7 +669,7 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -683,27 +683,27 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
@@ -1847,29 +1847,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opções:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Negócios"
 
@@ -2860,14 +2866,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Armazém"
 
@@ -2878,7 +2884,7 @@ msgstr "Armazém"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -3246,7 +3252,7 @@ msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Ofício"
 
@@ -5285,82 +5291,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (Habilite para menos uso de memória)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar a extensão textura retangular (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Utilizar nova textura de formato interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ativar atlas de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6307,7 +6318,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7765,18 +7776,18 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9174,7 +9185,7 @@ msgstr "Usuário deletado."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -9478,7 +9489,7 @@ msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9486,23 +9497,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
@@ -9624,13 +9635,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9775,8 +9786,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9828,7 +9839,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 59897b6ae..cc853b0ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -51,7 +51,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -578,41 +578,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Ajuda"
@@ -633,7 +633,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -646,32 +646,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -687,7 +687,7 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -701,27 +701,27 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
@@ -1864,29 +1864,35 @@ msgid "Particles: %u"
 msgstr "Partículas: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Item nomeado: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Cartões: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opções:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Negociação"
 
@@ -2877,14 +2883,14 @@ msgstr "Status"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Armazém"
 
@@ -2895,7 +2901,7 @@ msgstr "Armazém"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -3263,7 +3269,7 @@ msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Ofício"
 
@@ -5435,83 +5441,88 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Melhor qualidade (desabilitar para melhor desempenho)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Habilitar reordenação de sprites (necessário para suporte de mods)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (habilite para usar menos memória)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr "Opções Diversas (habilitar ou desabilitar pode melhorar desempenho)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Habilitar compressão de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar extensão de texturas retangulares (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usar nova textura de formato interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ativar atlas de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 "Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Guardar todos os sons em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr "Opções críticas (NÃO modifique se você não sabe o que está fazendo)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Desativar registros dentro do jogo (não habilitar)"
 
@@ -6460,7 +6471,7 @@ msgstr "MA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Correio"
 
@@ -7918,18 +7929,18 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Falha ao adicionar item. Você não negociar itens equipados."
 
@@ -9330,7 +9341,7 @@ msgstr "Usuário apagado permanentemente."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -9634,7 +9645,7 @@ msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Faltam %s tempo de aluguel pelo item %s."
@@ -9642,23 +9653,23 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
@@ -9780,13 +9791,13 @@ msgid "Select warp target"
 msgstr "Selecione o alvo do warp"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Item vendido: %s quantidade: %d. Você obteve: %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "item vendido: %s quantidade: %d"
@@ -9931,8 +9942,8 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9984,7 +9995,7 @@ msgid "Extended"
 msgstr "Estendido"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "Npc"
 
diff --git a/po/ru.po b/po/ru.po
index 8adc4003c..ae771afda 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
@@ -47,7 +47,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -574,41 +574,41 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Помощь"
@@ -629,7 +629,7 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -642,32 +642,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -683,7 +683,7 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -697,27 +697,27 @@ msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
@@ -1858,29 +1858,35 @@ msgid "Particles: %u"
 msgstr "Частицы: %u"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr "Именной предмет для: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "Карты: "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Опции:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Торговать"
 
@@ -2871,14 +2877,14 @@ msgstr "Статы"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Хранилище"
 
@@ -2889,7 +2895,7 @@ msgstr "Хранилище"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Телега"
 
@@ -3257,7 +3263,7 @@ msgstr "Окна"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "Крафт"
 
@@ -5310,87 +5316,93 @@ msgid "Enable OpenGL context creation"
 msgstr "Включить создание контекста OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#, fuzzy
+msgid "Enable OpenGL direct state access"
+msgstr "Включить создание контекста OpenGL"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Улучшение качества (выключите для лучшей производительности)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Включить исправление альфа канала (программный режим, может быть очень "
 "медленным)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Отображать прозрачность на персонажах и монстрах"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Включить перестановку спрайтов (нужен для модов)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Выключить расширенное кеширование сущностей (программный режим)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Выключить кеширование сущностей (программный режим)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Разные настройки (включение или выключение может улучшить производительность)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Включить компрессию текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Включить расширение - прямоугольные текстуры (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Использовать новый формат текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Включить атласы текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr "Кэшировать все спрайты на карте (может быть использовано много памяти)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Кешировать все звуки (может использовать дополнительную память)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 "Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Отключить ведение лога в игре (не включать)"
 
@@ -6339,7 +6351,7 @@ msgstr "ПО"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr "Почта"
 
@@ -7801,19 +7813,19 @@ msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Ошибка добавления предмета. Вы не можете обменивать одетые предметы."
 
@@ -9212,7 +9224,7 @@ msgstr "Пользователь удален."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
@@ -9516,7 +9528,7 @@ msgid "Guild castle: %s"
 msgstr "Замки гильдии: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Осталось %s арендного времени для %s."
@@ -9524,23 +9536,23 @@ msgstr "Осталось %s арендного времени для %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Учетная запись не найдена. Попробуйте снова."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Старый пароль указан неверно."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
@@ -9662,13 +9674,13 @@ msgid "Select warp target"
 msgstr "Выберите точку назначения"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr "Продан предмет %s, количеством %d. Вы получили: %s"
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr "Продан %s, количеством %d"
@@ -9813,8 +9825,8 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9866,7 +9878,7 @@ msgid "Extended"
 msgstr "Расширенные"
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr "НИП"
 
diff --git a/po/sr.po b/po/sr.po
index de0251e7f..f97254d56 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -34,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -558,41 +558,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Stil"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "O programu"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Pomoć"
@@ -613,7 +613,7 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -626,32 +626,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Povezivanje sa serverom"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Ulaz u svet"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Tražim karaktere"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Poverzujem se sa serverom za igru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Menjam server igre"
 
@@ -667,7 +667,7 @@ msgstr "Menjam server igre"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -681,27 +681,27 @@ msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Zahtevam detalje registracije"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Promena lozinke"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Lozinka je uspešno promenjena!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Izmena e-mail adrese"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "E-mail adresa je uspešno promenjena!"
 
@@ -1836,29 +1836,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Opcije:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Trgovanje"
 
@@ -2849,14 +2855,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Lista predmeta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2867,7 +2873,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3235,7 +3241,7 @@ msgstr "Prozori"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5274,82 +5280,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6292,7 +6303,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7747,17 +7758,17 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9151,7 +9162,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr ""
 
@@ -9455,7 +9466,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9463,23 +9474,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9601,13 +9612,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9752,8 +9763,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9805,7 +9816,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 06e02bfc1..cb6a450f5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -555,41 +555,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Hjälp"
@@ -610,7 +610,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -623,32 +623,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -664,7 +664,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -678,27 +678,27 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
@@ -1836,29 +1836,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Inställningar:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Trade"
 
@@ -2849,14 +2855,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Storage"
 
@@ -2867,7 +2873,7 @@ msgstr "Storage"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Cart"
 
@@ -3235,7 +3241,7 @@ msgstr "Fönster"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5275,82 +5281,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Aktivera alphakanal-fix (Programvaran kan bli väldigt långsam)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Visa genomskinliga varelser"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Litet minne (aktivera för lägre minnes-användning)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Avaktivera avancerad varelse-cachning (Programvaran)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Avaktivera varelse-cachning (Programvara)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Aktivera rektangulär texturförlängning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Använd nya interna texturformat (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktivera texturmappning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6297,7 +6308,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7757,19 +7768,19 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
 "fönstret."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9168,7 +9179,7 @@ msgstr "Användarnamnet är permanent raderat."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Okänt fel."
 
@@ -9472,7 +9483,7 @@ msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9480,23 +9491,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Okänt item"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Gamla lösenordet är felaktigt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
@@ -9618,13 +9629,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9769,8 +9780,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9822,7 +9833,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 06e02bfc1..cb6a450f5 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -555,41 +555,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Hjälp"
@@ -610,7 +610,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -623,32 +623,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -664,7 +664,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -678,27 +678,27 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
@@ -1836,29 +1836,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Inställningar:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Trade"
 
@@ -2849,14 +2855,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Storage"
 
@@ -2867,7 +2873,7 @@ msgstr "Storage"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Cart"
 
@@ -3235,7 +3241,7 @@ msgstr "Fönster"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5275,82 +5281,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Aktivera alphakanal-fix (Programvaran kan bli väldigt långsam)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Visa genomskinliga varelser"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Litet minne (aktivera för lägre minnes-användning)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Avaktivera avancerad varelse-cachning (Programvaran)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Avaktivera varelse-cachning (Programvara)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Aktivera rektangulär texturförlängning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Använd nya interna texturformat (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktivera texturmappning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6297,7 +6308,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7757,19 +7768,19 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
 "fönstret."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9168,7 +9179,7 @@ msgstr "Användarnamnet är permanent raderat."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Okänt fel."
 
@@ -9472,7 +9483,7 @@ msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9480,23 +9491,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Okänt item"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Gamla lösenordet är felaktigt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
@@ -9618,13 +9629,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9769,8 +9780,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9822,7 +9833,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index bccb9c598..0cdb5aca9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -34,7 +34,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -557,41 +557,41 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Yardım"
@@ -612,7 +612,7 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -625,32 +625,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -666,7 +666,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -680,27 +680,27 @@ msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
@@ -1839,29 +1839,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Seçenekler:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Takas"
 
@@ -2852,14 +2858,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Envanter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2870,7 +2876,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3238,7 +3244,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5278,82 +5284,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6296,7 +6307,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7749,19 +7760,19 @@ msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
 "koyamazsınız."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9155,7 +9166,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Bilinemeyen hata."
 
@@ -9459,7 +9470,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9467,23 +9478,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Hesap bulunamadı. Lütfen tekrar giriş yapın."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Eski şifre hatalı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9605,13 +9616,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9756,8 +9767,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9809,7 +9820,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 4b8b90697..c235989c9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -35,7 +35,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -561,41 +561,41 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "Довідка"
@@ -616,7 +616,7 @@ msgstr "Довідка"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -629,32 +629,32 @@ msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -670,7 +670,7 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -684,27 +684,27 @@ msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
@@ -1843,29 +1843,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "Вага: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "Параметри:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "Торгівля"
 
@@ -2856,14 +2862,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "Сумка"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "Сховище"
 
@@ -2874,7 +2880,7 @@ msgstr "Сховище"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr "Візок"
 
@@ -3242,7 +3248,7 @@ msgstr "Вікна"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5281,85 +5287,90 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:105
 msgid "Better quality (disable for better performance)"
 msgstr "Покращити якість (вимкніть для кращої продуктивності)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Ввімкнути програмне відтворення прозорості (може бути дуже повільним)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr "Обробляти прозорість для істот"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr "Ввімкнути транспозицію спрайтів (потрібне для модів)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Режим економії пам'яті (при нестачі)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr "Вимкнути розширене кешування істот (програмне)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr "Вимкнути кешування істот"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої "
 "продуктивності)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr "Ввімкнути сжимання текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Ввімкнути розширення для прямокутних текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Вживати новий формат текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ввімкнути атласи текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr "Заносити в кеш всі спрайти на мапі (може забрати додаткову пам'ять)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Занести в кеш всі звуки (може забрати додаткову пам'ять)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 "Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr "Вимкнути ведення логу у грі (не вмикати)"
 
@@ -6304,7 +6315,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7764,17 +7775,17 @@ msgid "You give:"
 msgstr "Ти віддаєш:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9170,7 +9181,7 @@ msgstr "Користувач стертий."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "Невстановлена помилка."
 
@@ -9474,7 +9485,7 @@ msgid "Guild castle: %s"
 msgstr "Замок гільдії: %s"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9482,23 +9493,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "Невідомий предмет"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "Акаунт не знайдено. Будь ласка, спробуйте знов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "Старий пароль некоректний."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "Новий пароль замалий."
 
@@ -9620,13 +9631,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9771,8 +9782,8 @@ msgstr "Новітній OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9824,7 +9835,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 057f61ce8..079038e10 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -39,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -561,41 +561,41 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "关于"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "帮助"
@@ -616,7 +616,7 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -629,32 +629,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -670,7 +670,7 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -684,27 +684,27 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
@@ -1839,29 +1839,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "重量: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr ""
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "选项:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "交易"
 
@@ -2852,14 +2858,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "物品栏"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr "仓库"
 
@@ -2870,7 +2876,7 @@ msgstr "仓库"
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3238,7 +3244,7 @@ msgstr "窗口"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr "打造"
 
@@ -5275,82 +5281,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6293,7 +6304,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7744,17 +7755,17 @@ msgid "You give:"
 msgstr "你给予:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9150,7 +9161,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr "未知的错误."
 
@@ -9454,7 +9465,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9462,23 +9473,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr "未知物品"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr "旧密码不正确."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr "新密码太短."
 
@@ -9600,13 +9611,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9751,8 +9762,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9804,7 +9815,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5df62f747..20fb7aab8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-04-15 18:28+0300\n"
-"PO-Revision-Date: 2017-03-19 08:16+0000\n"
+"POT-Creation-Date: 2017-04-27 17:58+0300\n"
+"PO-Revision-Date: 2017-04-16 09:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -33,7 +33,7 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:168 src/client.cpp:1616 src/client.cpp:1651
+#: src/actions/actions.cpp:168 src/client.cpp:1620 src/client.cpp:1655
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
 #: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -555,41 +555,41 @@ msgstr "浮動的泡泡"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:913 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/dyetool/client.cpp:512
+#: src/client.cpp:916 src/dyetool/client.cpp:512
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "性能"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/dyetool/client.cpp:515
+#: src/client.cpp:919 src/dyetool/client.cpp:515
 #: src/gui/widgets/tabs/setup_video.cpp:111
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/dyetool/client.cpp:518
+#: src/client.cpp:922 src/dyetool/client.cpp:518
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主題"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922 src/dyetool/client.cpp:521
+#: src/client.cpp:925 src/dyetool/client.cpp:521
 msgid "About"
 msgstr "關於"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:928 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Help"
 msgstr "說明"
@@ -610,7 +610,7 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1530 src/client.cpp:1549
+#: src/client.cpp:932 src/client.cpp:1534 src/client.cpp:1553
 #: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
 #: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
 #: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
@@ -623,32 +623,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1157
 msgid "Connecting to server"
 msgstr "正在連接到伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1212 src/gui/windowmanager_unittest.cc:700
+#: src/client.cpp:1215 src/gui/windowmanager_unittest.cc:700
 msgid "Logging in"
 msgstr "正在登入"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1262
+#: src/client.cpp:1265
 msgid "Entering game world"
 msgstr "正在進入遊戲"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1419
 msgid "Requesting characters"
 msgstr "正在查詢角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1458
+#: src/client.cpp:1462
 msgid "Connecting to the game server"
 msgstr "正在連接到遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1474
 msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
@@ -664,7 +664,7 @@ msgstr "正在轉換遊戲伺服器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1527 src/client.cpp:1546 src/client.cpp:1751
+#: src/client.cpp:1531 src/client.cpp:1550 src/client.cpp:1755
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
@@ -678,27 +678,27 @@ msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1565
+#: src/client.cpp:1569
 msgid "Requesting registration details"
 msgstr "正在查詢註冊的詳細信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1612
+#: src/client.cpp:1616
 msgid "Password Change"
 msgstr "更改密碼"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1614
+#: src/client.cpp:1618
 msgid "Password changed successfully!"
 msgstr "成功更改密碼!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1647
+#: src/client.cpp:1651
 msgid "Email Change"
 msgstr "更改電郵地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1649
+#: src/client.cpp:1653
 msgid "Email changed successfully!"
 msgstr "成功更改電郵地址!"
 
@@ -1833,29 +1833,35 @@ msgid "Particles: %u"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:226
+#: src/gui/popups/itempopup.cpp:241
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:314
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:341
 msgid "Cards: "
 msgstr "卡片： "
 
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:378
+#, fuzzy
+msgid "Options: "
+msgstr "選項:"
+
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:926
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:360
+#: src/resources/inventory/inventory.cpp:373
 msgid "Trade"
 msgstr "交易"
 
@@ -2846,14 +2852,14 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:108
 #: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:330
+#: src/resources/inventory/inventory.cpp:343
 msgid "Inventory"
 msgstr "背包"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2974 src/resources/inventory/inventory.cpp:348
 msgid "Storage"
 msgstr ""
 
@@ -2864,7 +2870,7 @@ msgstr ""
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2977 src/gui/windowmenu.cpp:112
 #: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:345
+#: src/resources/inventory/inventory.cpp:358
 msgid "Cart"
 msgstr ""
 
@@ -3232,7 +3238,7 @@ msgstr "視窗"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:355
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
 msgid "Craft"
 msgstr ""
 
@@ -5269,82 +5275,87 @@ msgid "Enable OpenGL context creation"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:101
-msgid "Better quality (disable for better performance)"
+#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+msgid "Enable OpenGL direct state access"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:105
+msgid "Better quality (disable for better performance)"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:109
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+#: src/gui/widgets/tabs/setup_perfomance.cpp:114
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:118
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:123
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+#: src/gui/widgets/tabs/setup_perfomance.cpp:128
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:133
+#: src/gui/widgets/tabs/setup_perfomance.cpp:137
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:154
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:154
+#: src/gui/widgets/tabs/setup_perfomance.cpp:158
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:159
+#: src/gui/widgets/tabs/setup_perfomance.cpp:163
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+#: src/gui/widgets/tabs/setup_perfomance.cpp:168
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:168
+#: src/gui/widgets/tabs/setup_perfomance.cpp:172
 msgid "Disable logging in game (do not enable)"
 msgstr ""
 
@@ -6287,7 +6298,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:350
+#: src/resources/inventory/inventory.cpp:363
 msgid "Mail"
 msgstr ""
 
@@ -7738,17 +7749,17 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:439
+#: src/gui/windows/tradewindow.cpp:443
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:528
+#: src/gui/windows/tradewindow.cpp:532
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的物品."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:541
+#: src/gui/windows/tradewindow.cpp:545
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -9142,7 +9153,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:217 src/net/tmwa/loginrecv.cpp:120
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
 msgid "Unknown error."
 msgstr ""
 
@@ -9446,7 +9457,7 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:857
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9454,23 +9465,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
+#: src/net/eathena/inventoryrecv.cpp:1217
+#: src/net/eathena/inventoryrecv.cpp:1350 src/resources/db/itemdb.cpp:196
 msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:213 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
 msgid "New password too short."
 msgstr ""
 
@@ -9592,13 +9603,13 @@ msgid "Select warp target"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:246
+#: src/net/eathena/vendingrecv.cpp:244
 #, c-format
 msgid "Sold item %s amount %d. You got: %s"
 msgstr ""
 
 #. TRANSLATORS: vending sold item message
-#: src/net/eathena/vendingrecv.cpp:254
+#: src/net/eathena/vendingrecv.cpp:252
 #, c-format
 msgid "Sold item %s amount %d"
 msgstr ""
@@ -9743,8 +9754,8 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:375
-#: src/resources/db/itemdb.cpp:379 src/resources/db/mercenarydb.cpp:101
+#: src/resources/db/homunculusdb.cpp:99 src/resources/db/itemdb.cpp:381
+#: src/resources/db/itemdb.cpp:385 src/resources/db/mercenarydb.cpp:101
 #: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
 #: src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9796,7 +9807,7 @@ msgid "Extended"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:353
 msgid "Npc"
 msgstr ""