24 files changed, 1734 insertions, 1343 deletions

diff --git a/po/ca.po b/po/ca.po
index 30e5ca990..f4e85a747 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -376,84 +376,84 @@ msgid "Visible on map"
 msgstr "Visible al mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Humà"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "esquiva"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Has intentat agafar un objecte inexistent."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "L'objecte es massa pesant."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "L'objecte esta massa lluny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "L'inventari està complet."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "La pila d'objectes es massa gran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "L'objecte pertany a una altra persona."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Problema desconegut al agafar l'objecte."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -462,58 +462,58 @@ msgstr[1] "Has recollit %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "treball"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2143,7 +2143,7 @@ msgstr "Cancel·lar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Jugadors"
 
@@ -5347,7 +5347,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5366,109 +5368,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Mostra gènere"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Mostra nivell"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Mostra nom propi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Apuntar jugadors morts"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Noms visibles"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Mostra finestres emergents de jugadors"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7772,7 +7785,7 @@ msgid "Completed"
 msgstr "Complet"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Qui Està en Línia - Actualitzant"
 
@@ -7787,12 +7800,12 @@ msgid "Who Is Online - "
 msgstr "Qui Està En Línia - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Qui Està En Línia - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Qui Està En Línia - Actualitza"
 
@@ -10858,3 +10871,6 @@ msgstr "Segon  %d"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
+
+#~ msgid "Visible names"
+#~ msgstr "Noms visibles"
diff --git a/po/cs.po b/po/cs.po
index 522d20189..28e4f9058 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,84 +380,84 @@ msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Člověk"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "uskočení"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Byl jsi zabit %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Nemůžeš zvednout toto možství předmětů."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Tvůj počet předmětů dasáhl maxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -467,58 +467,58 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -2150,7 +2150,7 @@ msgstr "Zrušit"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Hráči"
 
@@ -5359,7 +5359,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Zakázat záznam ve hře (nepovolit)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5378,103 +5380,115 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Pohyb a výběr"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Zobrazit pohlaví"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Zobrazit úroveň"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Zobrazit vlastní jméno"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Povolit rozšířené zaměřování myší"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Zaměřovat mrtvé hráče"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Viditelná jména"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Jména ostatních hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Automaticky posouvat jména"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Bezpečné obchody"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Nebezpečné znaky ve jménech"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Zobrazovat statusy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Zobrazovat IP adresy ve snímcích obrazovky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Povolit léčení sebe sama kliknutím myši"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Řadit přátele v kdo je online dohromady"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Skryj postavy smazaných hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Požít speciální diagonální rychlost pro pohyb hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5482,7 +5496,7 @@ msgstr ""
 "dotyková rozhraní)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7789,7 +7803,7 @@ msgid "Completed"
 msgstr "Hotovo"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -7804,12 +7818,12 @@ msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Kdo je přihlášený - Update"
 
@@ -10880,3 +10894,6 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
+
+#~ msgid "Visible names"
+#~ msgstr "Viditelná jména"
diff --git a/po/de.po b/po/de.po
index ab808daf5..3e14b8462 100644
--- a/po/de.po
+++ b/po/de.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
@@ -410,84 +410,84 @@ msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Mensch"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Du wurdest von %s getötet."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Du kannst nicht diese Menge an Gegenständen aufnehmen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Dein Gegenstandsstapel hat das Maximum erreicht."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -496,58 +496,58 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "EP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Homun"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Folgen: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -2186,7 +2186,7 @@ msgstr "Abbrechen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Spieler"
 
@@ -5532,7 +5532,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Aufzeichnen im Spiel deaktivieren (Nicht aktivieren)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "Verstecke"
 
@@ -5551,109 +5553,121 @@ msgstr "Rechts anzeigen"
 msgid "show at bottom"
 msgstr "Unten anzeigen"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Auswählen & Bewegen"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Geschlecht anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Level anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Eigenen Namen anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Erweitertes Zielen mit der Maus aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Anvisieren toter Spieler"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Sichtbare Namen"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Namen anderer Spieler"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Namen automatisch bewegen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Abzeichen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Sicheres Handeln"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Unsichere Zeichen im Namen verwenden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Status anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "IP auf Screenshots anzeigen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Selbstheilung mit Mausklick erlauben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Freunde im Fenster: Wer ist online? gruppieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Gelöschte Spielernamen verstecken"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Spieler ID abrufen und Log anschauen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Besondere diagonale Geschwindigkeit bei Spielerbewegung benutzen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Spieleraktionen loggen (für GMs)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Erstelle Bildschirmfoto für jeden abgeschlossenen Handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr "Rechtsklick bei langem Klick emulieren (nützlich für Touchpads)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Fernbefehle aktivieren"
 
@@ -7967,7 +7981,7 @@ msgid "Completed"
 msgstr "Fertig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online? - Aktualisierung"
 
@@ -7982,12 +7996,12 @@ msgid "Who Is Online - "
 msgstr "Wer ist Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisierung"
 
@@ -11084,3 +11098,6 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
+
+#~ msgid "Visible names"
+#~ msgstr "Sichtbare Namen"
diff --git a/po/eo.po b/po/eo.po
index 13d788caf..03292e5d6 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-10-05 21:26+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
@@ -377,84 +377,84 @@ msgid "Visible on map"
 msgstr "Videbla sur mapo"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Homo"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "evito"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "maltrafo"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "F"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "N"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Vin mortigis %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Provis preni neekzistantan objekton."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Objekto estas tro peza."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Objekto estas tro malproksima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Objektujo estas plena."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Stako estas tro granda."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Objekto apartenas al iu alia."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Vi ne povas preni tiom da objektoj."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Via objekta stako havas la maksimuman nombron."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Nekonata eraro prenante objekton."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -463,58 +463,58 @@ msgstr[1] "Vi prenis %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "sperto"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "lerto"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Artohomo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "sano"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "energio"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Sekvi: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Sekvado ĉesis"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiti: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitado ĉesis"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Vi vidas %s"
@@ -2146,7 +2146,7 @@ msgstr "Rezigni"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Ludantoj"
 
@@ -5467,7 +5467,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Malŝalti protokoladon en ludo (ne ŝaltu)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "kaŝi"
 
@@ -5486,110 +5488,122 @@ msgstr "montri dekstre"
 msgid "show at bottom"
 msgstr "montri sube"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Movo kaj selekto"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Montri sekson"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Montri nivelon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Montri propran nomon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Ŝalti etendan celadon de muso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Celi mortajn ludantojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Videblaj nomoj"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Aliaj nomoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Aŭtomate movi nomojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Insignoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Sekuraj negocoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Nesekuraj simboloj en nomoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Montri statojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Montri ip adresojn sur ekrankopioj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Permesi memresanigon per klako"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Grupigi amikojn en la \"kiu estas konektita\" fenestro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Kaŝi forigitajn ludantajn kaŝnomojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Kolekti identigaĵojn kaj vidajn protokolojn de ludantoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Uzi specialan diagonalan rapidecon por movado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Protokoli agojn de ludanto (por LG)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Krei ekrankopion por ĉiu finita negoco"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 "Imiti dekstran musbutonon per longtempa klako (utila por tuŝaj fasadoj)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Ŝalti forajn komandojn"
 
@@ -7899,7 +7913,7 @@ msgid "Completed"
 msgstr "Finfarita"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Kiu Estas Konektita - Aktualigata"
 
@@ -7914,12 +7928,12 @@ msgid "Who Is Online - "
 msgstr "Kiu Estas Konektita - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Kiu Estas Konektita - eraro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Kiu Estas Konektita - Aktualigo"
 
@@ -10993,3 +11007,6 @@ msgstr "%d sekundo"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundoj"
+
+#~ msgid "Visible names"
+#~ msgstr "Videblaj nomoj"
diff --git a/po/es.po b/po/es.po
index b039eb58f..f0904a5d8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
@@ -393,84 +393,84 @@ msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Fuiste asesinado por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "No puedes recoger esta cantidad de objetos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Tu montón de objetos esta al máximo."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -479,58 +479,58 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Homúnculo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "maná"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -2166,7 +2166,7 @@ msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Jugadores"
 
@@ -5416,7 +5416,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Deshabilitar registro en el juego (no habilitar)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "ocultar"
 
@@ -5435,103 +5437,115 @@ msgstr "mostrar a la derecha"
 msgid "show at bottom"
 msgstr "mostrar debajo"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Mover y seleccionar"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Mostrar género"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Mostrar nivel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Activar la selección extendida con el ratón"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Nombres visibles"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Nombre de otros jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Mover nombres automáticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Distintivos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Caracteres inseguros en los nombres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar dirección IP en la captura de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curarse a sí mismo con clic del ratón"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Grupo de amigos en la ventana de conectados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Ocultar los nicks de jugadores borrados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Registrar ID de jugador y última vez visto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Usar velocidad diagonal especial en movimiento de jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Registrar acciones de jugadores (para GM)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Crear capturas de pantalla para cada intercambio completado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5539,7 +5553,7 @@ msgstr ""
 "interfaces táctiles)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Habilitar comandos remotos"
 
@@ -7855,7 +7869,7 @@ msgid "Completed"
 msgstr "Completado"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -7870,12 +7884,12 @@ msgid "Who Is Online - "
 msgstr "Quién está conectado - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Quién está conectado - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Quién está conectado - Actualizar"
 
@@ -10962,3 +10976,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Visible names"
+#~ msgstr "Nombres visibles"
diff --git a/po/fi.po b/po/fi.po
index 3a9160d10..542916549 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -375,84 +375,84 @@ msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "-"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -461,58 +461,58 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2143,7 +2143,7 @@ msgstr "Peru"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Pelaajat"
 
@@ -5347,7 +5347,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5366,109 +5368,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Näytä sukupuoli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Näytä taso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Ota käyttöön laajennettu kohteen valinta hiirellä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Näytä nimet"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Näytä pelaajaponnahdusikkunat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Turvattomia merkkejä nimissä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Näytä tilat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Näytä IP-osoitteet kuvakaappauksissa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Salli itsen parantaminen hiiren napsautuksella"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7766,7 +7779,7 @@ msgid "Completed"
 msgstr "Valmis"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -7781,12 +7794,12 @@ msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -10857,3 +10870,6 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
+
+#~ msgid "Visible names"
+#~ msgstr "Näytä nimet"
diff --git a/po/fr.po b/po/fr.po
index 26027cb4f..1ddb8f1c1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-28 10:42+0000\n"
 "Last-Translator: Alige\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
@@ -398,84 +398,84 @@ msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Humain"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Tu as été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Tu as essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "L'inventaire est plein."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "La pile est trop grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Tu ne peux pas ramasser cette quantité d'objets."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Ta pile de cet objet est pleine."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -484,58 +484,58 @@ msgstr[1] "Tu as ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Homon"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "PV"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "Mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -2178,7 +2178,7 @@ msgstr "Annuler"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Joueurs"
 
@@ -5533,7 +5533,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Désactiver l'entrée en jeu (ne pas activer)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "masquer"
 
@@ -5552,104 +5554,116 @@ msgstr "afficher à droite"
 msgid "show at bottom"
 msgstr "afficher en bas"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Déplacement & sélection"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Afficher le sexe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Afficher le niveau"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Activer le mode de visée étendu de la souris"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Viser les joueurs morts"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Afficher les noms"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Autres noms de joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Bouger automatiquement les noms"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Badges"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Montrer les Statuts"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Afficher les adresses ip sur les captures d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Autoriser la récupération automatique sur clic droit de la souris"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Regrouper les amis dans la fenêtre de qui est en ligne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Cacher les noms des joueurs supprimés"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Récupérer les ID des joueurs et l'historique de vue"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 "Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Enregistrer les actions des joueurs (pour les GM)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Créer un imprimé écran pour chaque échange réussi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5657,7 +5671,7 @@ msgstr ""
 "interfaces tactiles)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Active les commandes à distance"
 
@@ -7975,7 +7989,7 @@ msgid "Completed"
 msgstr "Terminé"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -7990,12 +8004,12 @@ msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -11089,3 +11103,6 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
+
+#~ msgid "Visible names"
+#~ msgstr "Afficher les noms"
diff --git a/po/id.po b/po/id.po
index 0a73ee698..7fe7e653a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,84 +380,84 @@ msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Manusia"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "menghindar"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Kamu dibunuh oleh %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak ada."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Barang terlalu berat."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Barang terlalu jauh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Penyimpanan sudah penuh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Tumpukan terlalu besar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Barang masih milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Kamu tidak bisa mengambil barang dalam jumlah ini."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Jumlah tumpukan barangmu sudah maksimal."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Masalah mengambil barang yang tidak diketahui."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -465,58 +465,58 @@ msgstr[0] "Kamu mengambil %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "pekerjaan"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Ikuti: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Tiruan: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Kamu lihat %s"
@@ -2147,7 +2147,7 @@ msgstr "Batal"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Pemain"
 
@@ -5349,7 +5349,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5368,109 +5370,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Perlihatkan jenis kelamin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Perlihatkan Level"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Nama yang tampak"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Nama pemain lain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7765,7 +7778,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7780,12 +7793,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -10851,3 +10864,6 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
+
+#~ msgid "Visible names"
+#~ msgstr "Nama yang tampak"
diff --git a/po/it.po b/po/it.po
index bb9703ce6..e724c538d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
@@ -386,84 +386,84 @@ msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Umano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Sei stato ucciso da %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "L'inventario è pieno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -472,58 +472,58 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Segui: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imita: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2159,7 +2159,7 @@ msgstr "Annulla"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Giocatori"
 
@@ -5363,7 +5363,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5382,109 +5384,121 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Mostra bottoni sullo schermo"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Mostra il sesso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Mostra il livello"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Mostra il proprio nome"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Attiva selezione target con mouse estesa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Target sui personaggi morti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Nomi visibili"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Visualizza messaggi popup"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Mostra Status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Mostra indirizzo IP negli screenshots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Consenti di curarti da solo con il click del mouse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Raggruppa gli amici nella finestra di chi è online"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7794,7 +7808,7 @@ msgid "Completed"
 msgstr "Completato"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
@@ -7809,12 +7823,12 @@ msgid "Who Is Online - "
 msgstr "Chi è online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -10885,3 +10899,6 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
+
+#~ msgid "Visible names"
+#~ msgstr "Nomi visibili"
diff --git a/po/ja.po b/po/ja.po
index ff1e79d6f..c6a6a88bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,84 +380,84 @@ msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "人間"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -465,58 +465,58 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2149,7 +2149,7 @@ msgstr "キャンセル"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "プレイヤー"
 
@@ -5353,7 +5353,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5372,109 +5374,121 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "オンスクリーンボタンを表示"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "性別を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "レベルを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "自分の名前を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "エクステンドマウスターゲットを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "死んだプレイヤーの標的を有効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "名前を表示する"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "プレイヤーポップアップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "トレードを安全化する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "セキュリティ上安全ではない文字が含まれています"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "ステータスを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "スクリーンショットにIPを表示させる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "クリックでヒール"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "オンラインリストをグループ化する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7771,7 +7785,7 @@ msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
@@ -7786,12 +7800,12 @@ msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -10862,3 +10876,6 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d秒"
+
+#~ msgid "Visible names"
+#~ msgstr "名前を表示する"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 73c154131..7f5c06d80 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: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+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"
@@ -373,84 +373,84 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -459,58 +459,58 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2140,7 +2140,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr ""
 
@@ -5342,7 +5342,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5361,109 +5363,119 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+msgid "Show player names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7760,7 +7772,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7775,12 +7787,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 424df826c..5e1e9bdf3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -377,84 +377,84 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Mens"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -463,58 +463,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -2146,7 +2146,7 @@ msgstr "Annuleren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Spelers"
 
@@ -5348,7 +5348,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5367,109 +5369,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Toon geslacht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Toon niveau"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Viseer dode spelers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Zichtbare namen"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7774,7 +7787,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -7789,12 +7802,12 @@ msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -10865,3 +10878,6 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Visible names"
+#~ msgstr "Zichtbare namen"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 424df826c..5e1e9bdf3 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -377,84 +377,84 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Mens"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -463,58 +463,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -2146,7 +2146,7 @@ msgstr "Annuleren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Spelers"
 
@@ -5348,7 +5348,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5367,109 +5369,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Toon geslacht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Toon niveau"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Viseer dode spelers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Zichtbare namen"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7774,7 +7787,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -7789,12 +7802,12 @@ msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -10865,3 +10878,6 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Visible names"
+#~ msgstr "Zichtbare namen"
diff --git a/po/pl.po b/po/pl.po
index f2a778a40..06fa99d4e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -383,84 +383,84 @@ msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Człowiek"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -470,58 +470,58 @@ msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -2154,7 +2154,7 @@ msgstr "Anuluj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Gracze"
 
@@ -5358,7 +5358,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5377,103 +5379,115 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Ruch i wybór"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Pokazuj płeć"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Pokazuj poziom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Pokazuj własne imię"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Włącz zaawansowane namierzanie myszką"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Namierzaj martwych graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Widoczne imiona"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Imiona Innych Graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Automatycznie przenoś imiona"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Bezpieczny handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Niebezpieczne znaki w imionach"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Pokaż statusy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Pokaż adres IP na zrzutach ekranu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Pozwól na leczenie siebie kliknięciem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Grupuj przyjaciół w oknie obecnych online"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Ukryj nicki usuniętych graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Użyj specjalnej diagonalnej prędkości do poruszania się."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5481,7 +5495,7 @@ msgstr ""
 "(przydatne dla ekranów dotykowych)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7792,7 +7806,7 @@ msgid "Completed"
 msgstr "Zakończono"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
@@ -7807,12 +7821,12 @@ msgid "Who Is Online - "
 msgstr "Gracze online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -10883,3 +10897,6 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
+
+#~ msgid "Visible names"
+#~ msgstr "Widoczne imiona"
diff --git a/po/pt.po b/po/pt.po
index 2702b13e3..2d1be58d4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
@@ -379,84 +379,84 @@ msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Foste morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -465,58 +465,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -2155,7 +2155,7 @@ msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Jogadores"
 
@@ -5359,7 +5359,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5378,109 +5380,121 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Move & Seleção"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Mostrar nível"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Ativar segmentação prolongada de mouse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Jogadores(as) mortos(as) como alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Nomes visíveis"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Nomes de outros jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Nomes de movimentos automáticos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Ver status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de IP em Capturas de Tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curar-se com o clique do mouse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Grupo de amigos na lista online"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Ocultar nicks de jogadores apagados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7787,7 +7801,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -7802,12 +7816,12 @@ msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -10878,3 +10892,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Visible names"
+#~ msgstr "Nomes visíveis"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d9ab0dd3f..4b60cf9e2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
@@ -397,84 +397,84 @@ msgid "Visible on map"
 msgstr "Mapa visivel"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Você foi morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Você não pode pegar essa quantia de itens."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Sua pilha de itens possui a quantidade máxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -483,58 +483,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Homúnculo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -2172,7 +2172,7 @@ msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Jogadores"
 
@@ -5510,7 +5510,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Desativar registros dentro do jogo (não habilitar)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "Esconder"
 
@@ -5529,103 +5531,115 @@ msgstr "mostrar à direita"
 msgid "show at bottom"
 msgstr "mostrar no fundo"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Move & seleção"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Mostrar nível"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Ativar segmentação de mouse prolongado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Jogadores(as) mortos(as) como alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Nomes visíveis"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Nomes de Outros Jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Mover nomes automaticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Emblema"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Negociações seguras"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Mostrar status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de IP em Capturas de Tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Permitir se curar com o clique do mouse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Grupo de amigos que está na janela on-line"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Esconder nicks de jogadores apagados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Coletar id do jogador e ver log"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Utilizar velocidade diagonal especial em jogadores se movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Registro de ações de Jogadores (para GM)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Tira uma foto da tela a cada negociação completa."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5633,7 +5647,7 @@ msgstr ""
 "esquerdo (útil para interfaces de toque)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Habilitar comandos remotos"
 
@@ -7940,7 +7954,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -7955,12 +7969,12 @@ msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -11041,3 +11055,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
+
+#~ msgid "Visible names"
+#~ msgstr "Nomes visíveis"
diff --git a/po/ru.po b/po/ru.po
index a7bc6b025..a34070824 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -391,84 +391,84 @@ msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Человек"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "уклонение"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "Б"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Вы были убиты %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Вы не можете поднять такое количество."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Слишком много предметов в стэке."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -479,58 +479,58 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr "Гомун"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "здоровье"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "мана"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -2166,7 +2166,7 @@ msgstr "Отмена"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Игроки"
 
@@ -5389,7 +5389,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Отключить ведение лога в игре (не включать)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr "скрыть"
 
@@ -5408,109 +5410,121 @@ msgstr "выводить справа"
 msgid "show at bottom"
 msgstr "выводить снизу"
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Движение и выбор"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Показать пол"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Показать уровень"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Показать свое имя"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Включить расширенное наведение мыши"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Видимые имена"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Имена других игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Автоматически сдвигать имена"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr "Значки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Небезопасные символы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Показывать статусы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Показывать ip адреса на снимках экрана"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Включить самолечение по клику мыши"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Группировать друзей в окне онлайн списка"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Спрятать имена стертых персонажей"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr "Собирать ид. игроков и время последней встречи"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Использовать специальную диагональную скорость в передвижении игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr "Логировать действия пользователей (для ГМ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr "Создавать снимок экрана для каждого законченного обмена"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr "Эмулировать правую кнопку мыши при помощи долгого нажатия левой кнопки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr "Включить возможность получения удаленных команд"
 
@@ -7824,7 +7838,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -7839,12 +7853,12 @@ msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -10921,3 +10935,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Visible names"
+#~ msgstr "Видимые имена"
diff --git a/po/sr.po b/po/sr.po
index 4d211d7ce..4408d5123 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -376,84 +376,84 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "izbegnuto"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "promašaj"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -463,58 +463,58 @@ msgstr[2] "Pokupio %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2144,7 +2144,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Igrači"
 
@@ -5348,7 +5348,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5367,109 +5369,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Prikaži pol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Prikaži nivo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Prikaži svoje ime"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Ciljaj mrtve igrače"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Vidljiva imena"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Sinhronizovano kretanje igrača"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7768,7 +7781,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Ko je dostupan - Ažuriranje"
 
@@ -7783,12 +7796,12 @@ msgid "Who Is Online - "
 msgstr "Ko je dostupan - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Ko je dostupan - greška"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Ko je dostupan - Ažuriraj"
 
@@ -10853,3 +10866,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Visible names"
+#~ msgstr "Vidljiva imena"
diff --git a/po/sv.po b/po/sv.po
index b15bb4d88..1e02caf3d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -374,84 +374,84 @@ msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Människa"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -460,58 +460,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -2144,7 +2144,7 @@ msgstr "Avbryt"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Spelare"
 
@@ -5349,7 +5349,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5368,109 +5370,121 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Flytta och välj"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Visa kön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Visa level"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Visa eget namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Aktivera utökad mus-targeting"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Markera döda spelare"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Synliga namn"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Andra spelares namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Auto-flytta namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Säkra trades"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Osäkra tecken i namnen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Visa status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Visa ip-adress på skärmdumpar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Tillåt själv-healing med musklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Dölj raderade spelares nicks"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7780,7 +7794,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -7795,12 +7809,12 @@ msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -10872,3 +10886,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Visible names"
+#~ msgstr "Synliga namn"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index b15bb4d88..1e02caf3d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -374,84 +374,84 @@ msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Människa"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -460,58 +460,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -2144,7 +2144,7 @@ msgstr "Avbryt"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Spelare"
 
@@ -5349,7 +5349,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5368,109 +5370,121 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Flytta och välj"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Visa kön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Visa level"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Visa eget namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Aktivera utökad mus-targeting"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Markera döda spelare"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Synliga namn"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Andra spelares namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Auto-flytta namn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Säkra trades"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Osäkra tecken i namnen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Visa status"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Visa ip-adress på skärmdumpar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Tillåt själv-healing med musklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Dölj raderade spelares nicks"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7780,7 +7794,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -7795,12 +7809,12 @@ msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -10872,3 +10886,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Visible names"
+#~ msgstr "Synliga namn"
diff --git a/po/tr.po b/po/tr.po
index 3a69af2c4..2ba4893eb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -376,84 +376,84 @@ msgid "Visible on map"
 msgstr "Haritada görünür"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "İnsan"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "kaçırıldı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "İ"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "%s tarafından öldürüldün."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan item toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "İtem çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "İtem çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Küme çok büyük."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "İtem başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Bu miktardaki itemi alamazsınız."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "İtem kümesi maksimum miktarda."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "İtem toplamada bilinmeyen hata."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -462,58 +462,58 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "iş"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Takip et: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Takip iptal edildi."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Taklit: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "%s görüyorsun"
@@ -2147,7 +2147,7 @@ msgstr "İptal"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Oyuncular"
 
@@ -5352,7 +5352,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5371,109 +5373,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Cinsiyeti göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Leveli göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Kendi adını göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Ölü oyuncuları hedef al"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Görünür isimler"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Oyuncu açılır pencerelerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Güvenli takas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7772,7 +7785,7 @@ msgid "Completed"
 msgstr "Tamamlandı"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Kimler Online - Güncelleniyor"
 
@@ -7787,12 +7800,12 @@ msgid "Who Is Online - "
 msgstr "Kimler Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Kimler Online - hata"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Kimler Online - Güncelle"
 
@@ -10858,3 +10871,6 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
+
+#~ msgid "Visible names"
+#~ msgstr "Görünür isimler"
diff --git a/po/uk.po b/po/uk.po
index d81521ce4..b3640cf00 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -379,84 +379,84 @@ msgid "Visible on map"
 msgstr "Видимий на мапі"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "Людина"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "ухилення"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "Вас вбив %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "Спроби підняти неіснуючий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "Предмет занадто важкий."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "Предмет задалеко щоб підняти."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "В сумці немає місця."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Забагато предметів у купі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "Предмет належить комусь іншому."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "Не можливо підняти стільки предметів."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "Кількість цих предметів досягла межі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "Невстановлена помилка під час спроби підняти предмет."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -466,58 +466,58 @@ msgstr[2] "Ви підняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "досвід"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "робота"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "Йти слідом за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "Слідкування відмінено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "Імітація: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "Імітацію відмінено"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "Ти бачиш %s"
@@ -2151,7 +2151,7 @@ msgstr "Скасувати"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "Гравці"
 
@@ -5358,7 +5358,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr "Вимкнути ведення логу у грі (не вмикати)"
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5377,103 +5379,115 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+#, fuzzy
+msgid "show on selection"
+msgstr "Рух і вибір"
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "Показувати стать"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "Показувати рівень"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "Показувати особисте ім'я"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr "Ввімкнути розширене наведення миші"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "Дозволити наводити фокус на мертвих гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "Видимі імена"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "Імена інших гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr "Автоматичне переупорядкування імен гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr "Захистити торгівлю"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr "Небезпечні символи в іменах"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "Відображати статуси"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr "Додавати IP адреси до скріншоту (ГМ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr "Лікувати самого себе за кліком миші"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr "Відокремлювати приятелів у вікні \"Хто онлайн\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr "Ховати імена стертих гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr "Вжити спеціальну діагональну швидкість під час руху"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5481,7 +5495,7 @@ msgstr ""
 "інтерфейсах)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7785,7 +7799,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "Хто онлайн - оновлюється"
 
@@ -7800,12 +7814,12 @@ msgid "Who Is Online - "
 msgstr "Хто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "Хто онлайн - помилка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "Хто онлайн - оновити"
 
@@ -10874,3 +10888,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Visible names"
+#~ msgstr "Видимі імена"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 70fa12527..8418dc40f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -381,84 +381,84 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "人类"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -466,58 +466,58 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -2147,7 +2147,7 @@ msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "玩家"
 
@@ -5349,7 +5349,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5368,109 +5370,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr "显示性别"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr "显示水平"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr "显示自己的名字"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr "目标死球员"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr "可见姓名"
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "显示球员弹出窗口"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr "显示状态"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7765,7 +7778,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -7780,12 +7793,12 @@ msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -10852,3 +10865,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Visible names"
+#~ msgstr "可见姓名"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 6cee0409f..884323031 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-10-08 16:00+0300\n"
+"POT-Creation-Date: 2016-10-22 15:53+0300\n"
 "PO-Revision-Date: 2016-09-25 10:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -375,84 +375,84 @@ msgid "Visible on map"
 msgstr "在地圖上可見"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:459
+#: src/being/being.cpp:461
 msgid "Human"
 msgstr "人類"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "dodge"
 msgstr "閃避"
 
-#: src/being/being.cpp:655
+#: src/being/being.cpp:657
 msgid "miss"
 msgstr "失誤"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2436 src/gui/windows/whoisonline.cpp:885
+#: src/being/being.cpp:2438 src/gui/windows/whoisonline.cpp:886
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2441 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2443 src/gui/windows/whoisonline.cpp:891
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:401 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr "你已被 %s 殺死."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:874
+#: src/being/localplayer.cpp:883
 msgid "Tried to pick up nonexistent item."
 msgstr "曾試圖拿起不存在的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:887
 msgid "Item is too heavy."
 msgstr "該物品太重."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:891
 msgid "Item is too far away."
 msgstr "該物品太遠."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:895
 msgid "Inventory is full."
 msgstr "背包已滿."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "數目太大."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:903
 msgid "Item belongs to someone else."
 msgstr "該物品屬於其他人."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:907
 msgid "You can't pickup this amount of items."
 msgstr "你不能拿起這個數量的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:911
 msgid "Your item stack has max amount."
 msgstr "你的物品數量已達最大限額."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:909
+#: src/being/localplayer.cpp:918
 msgid "Unknown problem picking up item."
 msgstr "拿起物品時遇到不明錯誤."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:933
+#: src/being/localplayer.cpp:942
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -460,58 +460,58 @@ msgstr[0] "你拾取了 %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1113 src/being/localplayer.cpp:1115
-#: src/being/localplayer.cpp:1141 src/being/localplayer.cpp:1154
+#: src/being/localplayer.cpp:1155 src/being/localplayer.cpp:1157
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1196
 msgid "xp"
 msgstr "經驗值"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1119 src/being/localplayer.cpp:1125
-#: src/being/localplayer.cpp:1131
+#: src/being/localplayer.cpp:1161 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1173
 msgid "job"
 msgstr "勞動值"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1151
+#: src/being/localplayer.cpp:1193
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1163
+#: src/being/localplayer.cpp:1205
 msgid "hp"
 msgstr "生命值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1172
+#: src/being/localplayer.cpp:1214
 msgid "mana"
 msgstr "法力值"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2298
 #, c-format
 msgid "Follow: %s"
 msgstr "跟隨: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2262 src/being/localplayer.cpp:2287
+#: src/being/localplayer.cpp:2304 src/being/localplayer.cpp:2329
 msgid "Follow canceled"
 msgstr "已取消跟隨."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2314
 #, c-format
 msgid "Imitation: %s"
 msgstr "模仿:%s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2278 src/being/localplayer.cpp:2292
+#: src/being/localplayer.cpp:2320 src/being/localplayer.cpp:2334
 msgid "Imitation canceled"
 msgstr "已取消模仿."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2641
+#: src/being/localplayer.cpp:2683
 #, c-format
 msgid "You see %s"
 msgstr "你看到 %s"
@@ -2141,7 +2141,7 @@ msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Players"
 msgstr "玩家"
 
@@ -5343,7 +5343,9 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
+#. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:59
 msgid "hide"
 msgstr ""
 
@@ -5362,109 +5364,120 @@ msgstr ""
 msgid "show at bottom"
 msgstr ""
 
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "show"
+msgstr ""
+
+#. TRANSLATORS: visible name type
+#: src/gui/widgets/tabs/setup_players.cpp:63
+msgid "show on selection"
+msgstr ""
+
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:91
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:95
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
-msgid "Visible names"
-msgstr ""
+#: src/gui/widgets/tabs/setup_players.cpp:101
+#, fuzzy
+msgid "Show player names"
+msgstr "其他玩家名字"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:90
+#: src/gui/widgets/tabs/setup_players.cpp:106
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:111
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:115
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:119
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:123
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:127
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:135
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:139
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:143
 msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:131
+#: src/gui/widgets/tabs/setup_players.cpp:147
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:135
+#: src/gui/widgets/tabs/setup_players.cpp:151
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:139
+#: src/gui/widgets/tabs/setup_players.cpp:155
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:143
+#: src/gui/widgets/tabs/setup_players.cpp:159
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:148
+#: src/gui/widgets/tabs/setup_players.cpp:164
 msgid "Enable remote commands"
 msgstr ""
 
@@ -7759,7 +7772,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:656
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:657
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7774,12 +7787,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:672
+#: src/gui/windows/whoisonline.cpp:673
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:719
+#: src/gui/windows/whoisonline.cpp:720
 msgid "Who Is Online - Update"
 msgstr ""