summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ca.po93
-rw-r--r--po/cs.po93
-rw-r--r--po/de.po93
-rw-r--r--po/es.po93
-rw-r--r--po/fi.po93
-rw-r--r--po/fr.po93
-rw-r--r--po/id.po93
-rw-r--r--po/it.po93
-rw-r--r--po/ja.po93
-rw-r--r--po/manaplus.pot92
-rw-r--r--po/nl.po93
-rw-r--r--po/nl_BE.po93
-rw-r--r--po/pl.po93
-rw-r--r--po/pt.po93
-rw-r--r--po/pt_BR.po93
-rw-r--r--po/ru.po93
-rw-r--r--po/sv.po93
-rw-r--r--po/sv_SE.po93
-rw-r--r--po/tr.po93
-rw-r--r--po/uk.po93
-rw-r--r--po/zh_CN.po93
21 files changed, 1154 insertions, 798 deletions
diff --git a/po/ca.po b/po/ca.po
index f822953a2..d04e1aa1f 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-25 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
@@ -34,7 +34,7 @@ msgstr "Arxiu enviat"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -318,25 +318,25 @@ msgid "Visible on map"
msgstr "Visible al mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Humà"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "esquiva"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -486,37 +486,37 @@ msgstr "Bombolla flotant"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configuració"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -534,7 +534,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Iniciant sessió"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Entrant al mon de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Sol·licitant personatges"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -585,7 +585,7 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -602,37 +602,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Canvi de contrasenya"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Canvi de correu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis..."
@@ -672,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "General"
@@ -4545,46 +4545,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Mostra gènere"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5757,8 +5768,14 @@ msgstr "Present: %s; %d jugadors estan presents."
msgid "Whispering to %s: %s"
msgstr "Xiuxiuejant a %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index f45a1780f..7cc5fdb49 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -39,7 +39,7 @@ msgstr "Soubor byl uploadován"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -322,25 +322,25 @@ msgid "Visible on map"
msgstr "Viditelný na mapě"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Člověk"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "uskočení"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "minutí"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -491,37 +491,37 @@ msgstr "Plovoucí bublina"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Nastavení"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Výkon"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Téma"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "O ManaPlus"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Nápověda"
@@ -539,7 +539,7 @@ msgstr "Nápověda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -551,32 +551,32 @@ msgid "Close"
msgstr "Zavřít"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Vyžaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Vyměňuji herní servery"
@@ -590,7 +590,7 @@ msgstr "Vyměňuji herní servery"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -607,37 +607,37 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
@@ -677,7 +677,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Obecný"
@@ -4557,46 +4557,57 @@ msgstr "Automaticky posouvat jména"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Zobrazit předměty"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Bezpečné obchody"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Nebezpečné znaky ve jménech"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Zobrazovat statusy"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
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:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Skryj postavy smazaných hráčů"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5774,8 +5785,14 @@ msgstr "Přítomni: %s; %d hráčů je přítomno."
msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "mazlíček patřící %s"
diff --git a/po/de.po b/po/de.po
index 51a099dca..e241ef7bb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-05-25 01:33+0000\n"
"Last-Translator: Suni <kristin.joris@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -58,7 +58,7 @@ msgstr "Datei hochgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -343,25 +343,25 @@ msgid "Visible on map"
msgstr "Auf der Karte sichtbar"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Mensch"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "ausweichen"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -511,37 +511,37 @@ msgstr "Schwebende Blase"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Einstellungen"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Leistung"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Theme"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Über"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hilfe"
@@ -559,7 +559,7 @@ msgstr "Hilfe"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Schließen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Verbinde zum Spielserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Spielserver wechseln"
@@ -610,7 +610,7 @@ msgstr "Spielserver wechseln"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -627,37 +627,37 @@ msgid "Error"
msgstr "Fehler"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
@@ -697,7 +697,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Allgemein"
@@ -4585,46 +4585,57 @@ msgstr "Namen automatisch bewegen"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Gegenstände anzeigen"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Sicheres Handeln"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Unsichere Zeichen im Namen verwenden"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Status anzeigen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "IP auf Screenshots anzeigen."
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr "Selbstheilung mit Mausklick erlauben"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Gelöschte Spielernamen verstecken"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr "Rechtsklick bei langem Klick emulieren (nützlich für Touchpads)"
@@ -5805,8 +5816,14 @@ msgstr "Anwesend: %s ; %d Spieler sind anwesend."
msgid "Whispering to %s: %s"
msgstr "Flüstern zu %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "%ss Haustier"
diff --git a/po/es.po b/po/es.po
index 8b6aee5dd..a770be48c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-25 22:40+0000\n"
"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -46,7 +46,7 @@ msgstr "Archivo subido"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -330,25 +330,25 @@ msgid "Visible on map"
msgstr "Visibles en el mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "evade"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -498,37 +498,37 @@ msgstr "Burbuja flotante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configuración"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Rendimiento"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Acerca de..."
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ayuda"
@@ -546,7 +546,7 @@ msgstr "Ayuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -558,32 +558,32 @@ msgid "Close"
msgstr "Cerrar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
@@ -597,7 +597,7 @@ msgstr "Cambiando servidores del juego"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -614,37 +614,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registro cancelado"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
@@ -684,7 +684,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd archivoOrigen archivoDestino"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "General"
@@ -4568,46 +4568,57 @@ msgstr "Mover nombres automáticamente"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Mostrar vestimenta"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Intercambios seguros"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Caracteres inseguros en los nombres"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Mostrar estados"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
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:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Ocultar los nicks de jugadores borrados"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5791,8 +5802,14 @@ msgstr "Presentes: %s; %d jugadores están presentes."
msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "Mascota de %s"
diff --git a/po/fi.po b/po/fi.po
index 6062050c1..cc5d108e1 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -317,25 +317,25 @@ msgid "Visible on map"
msgstr "Näkyvillä kartalla"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr ""
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "väistö"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "P"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "-"
@@ -485,37 +485,37 @@ msgstr "Leijuva puhekupla"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Asetukset"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Kuva"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Teema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Apua"
@@ -533,7 +533,7 @@ msgstr "Apua"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -545,32 +545,32 @@ msgid "Close"
msgstr "Sulje"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
@@ -584,7 +584,7 @@ msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -601,37 +601,37 @@ msgid "Error"
msgstr "Virhe"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
@@ -671,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Yleiset"
@@ -4545,46 +4545,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Näytä tavarat"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Turvaa kaupat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Turvattomia merkkejä nimissä"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Näytä tilat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Näytä IP-osoitteet kuvakaappauksissa"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr "Salli itsen parantaminen hiiren napsautuksella"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5753,8 +5764,14 @@ msgstr "Läsnä: %s; %d pelaajaa paikalla."
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e1a1eb760..df766fc06 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-26 23:49+0000\n"
"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -46,7 +46,7 @@ msgstr "Fichier mis en ligne"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -332,25 +332,25 @@ msgid "Visible on map"
msgstr "Visible sur la carte"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Humain"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "esquive"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -500,37 +500,37 @@ msgstr "Bulle flottante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configuration"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performance"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vidéo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Thème"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "À propos"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Aide"
@@ -548,7 +548,7 @@ msgstr "Aide"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
msgstr "Fermer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
@@ -599,7 +599,7 @@ msgstr "Changement de serveur de jeu"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -616,37 +616,37 @@ msgid "Error"
msgstr "Erreur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Changer d'e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Désinscription réussie"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
@@ -687,7 +687,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Général"
@@ -4577,47 +4577,58 @@ msgstr "Bouger automatiquement les noms"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Montrer les objets"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Protection des échanges"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Caractère à risque dans le nom"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Montrer les Statuts"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
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:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Cacher les noms des joueurs supprimés"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5800,8 +5811,14 @@ msgstr "Présents : %s ; %d joueurs sont présents."
msgid "Whispering to %s: %s"
msgstr "Message privé envoyé à %s : %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "%s du familier"
diff --git a/po/id.po b/po/id.po
index 6763878f7..e6fe521ad 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -38,7 +38,7 @@ msgstr "Data telah terunggah"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -322,25 +322,25 @@ msgid "Visible on map"
msgstr "Terlihat di peta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Manusia"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "menghindar"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -489,37 +489,37 @@ msgstr "Gelembung mengambang"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Pengaturan"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performa"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vidio"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Tentang"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Bantuan"
@@ -537,7 +537,7 @@ msgstr "Bantuan"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
msgstr "Tutup"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Terhubung ke server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Mengambil karakter"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Terhubung ke server permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Mengganti server"
@@ -588,7 +588,7 @@ msgstr "Mengganti server"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -605,37 +605,37 @@ msgid "Error"
msgstr "Kesalahan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Perubahan Sandi"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat..."
@@ -675,7 +675,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "pewarnacmd sumberpewarnastring datadst"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Umum"
@@ -4548,46 +4548,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Perlihatkan Item"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Pertukaran yang aman"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Perlihatkan status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5755,8 +5766,14 @@ msgstr "Kehadiran: %s; %d pemain yang hadir."
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/it.po b/po/it.po
index d7f4c6504..acee07ce2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -43,7 +43,7 @@ msgstr "File caricato"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -327,25 +327,25 @@ msgid "Visible on map"
msgstr "Visibile nella mappa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Umano"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "Schivato"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "Mancato"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -495,37 +495,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Impostazioni"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Aiuto"
@@ -543,7 +543,7 @@ msgstr "Aiuto"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -555,32 +555,32 @@ msgid "Close"
msgstr "Chiudi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
@@ -594,7 +594,7 @@ msgstr "Cambiamento server del gioco"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -611,37 +611,37 @@ msgid "Error"
msgstr "Errore"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
@@ -681,7 +681,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Generale"
@@ -4558,46 +4558,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Mostra Oggetti"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Mostra Status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Mostra indirizzo IP negli screenshots"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5771,8 +5782,14 @@ msgstr "Presente: %s; %d giocatori sono presenti."
msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 322158fed..97ecf489f 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -39,7 +39,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -322,25 +322,25 @@ msgid "Visible on map"
msgstr "マップに表示させる"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "人間"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "ドッジ"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -489,37 +489,37 @@ msgstr "吹出し"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "ビデオ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "テーマ"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "ヘルプ"
@@ -537,7 +537,7 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
msgstr "閉じる"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
@@ -588,7 +588,7 @@ msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -605,37 +605,37 @@ msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "パスワードを変更しました!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "登録を解除しました"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう..."
@@ -675,7 +675,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "一般"
@@ -4549,46 +4549,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "アイテムを表示する"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "トレードを安全化する"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "セキュリティ上安全ではない文字が含まれています"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "ステータスを表示する"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "スクリーンショットにIPを表示させる"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr "クリックでヒール"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr "オンラインリストをグループ化する"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5756,8 +5767,14 @@ msgstr "現在: %s; %d プレイヤーがいます."
msgid "Whispering to %s: %s"
msgstr "%sにささやき中:%s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 6ff1297dc..3e142a814 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+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"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -315,25 +315,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr ""
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr ""
@@ -483,37 +483,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -543,32 +543,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr ""
@@ -582,7 +582,7 @@ msgstr ""
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -599,37 +599,37 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr ""
@@ -669,7 +669,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr ""
@@ -4535,46 +4535,56 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
-msgid "Secure trades"
+msgid "Show badges"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:77
-msgid "Unsecure chars in names"
+msgid "Show badges at top"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:81
-msgid "Show statuses"
+msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:85
-msgid "Show ip addresses on screenshots"
+msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:89
-msgid "Allow self heal with mouse click"
+msgid "Show statuses"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:93
-msgid "Group friends in who is online window"
+msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:97
-msgid "Hide erased players nicks"
+msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:101
-msgid "Use special diagonal speed in players moving"
+msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:105
+msgid "Hide erased players nicks"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:109
+msgid "Use special diagonal speed in players moving"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5741,8 +5751,14 @@ msgstr ""
msgid "Whispering to %s: %s"
msgstr ""
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index cc385e231..e7fa55077 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -319,25 +319,25 @@ msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Mens"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -487,37 +487,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performantie"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Over"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -535,7 +535,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -586,7 +586,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Algemeen"
@@ -4546,46 +4546,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Toon Voorwerpen"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5759,8 +5770,14 @@ msgstr "Aanwezig: %s; %d speler zijn aanwezig."
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index cc385e231..e7fa55077 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -319,25 +319,25 @@ msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Mens"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -487,37 +487,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performantie"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Over"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -535,7 +535,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -586,7 +586,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Algemeen"
@@ -4546,46 +4546,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Toon Voorwerpen"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5759,8 +5770,14 @@ msgstr "Aanwezig: %s; %d speler zijn aanwezig."
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1574272df..225a3507f 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -323,25 +323,25 @@ msgid "Visible on map"
msgstr "Widoczne na mapie"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Człowiek"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "Unik!"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "Pudło!"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -492,37 +492,37 @@ msgstr "Bąbelek nad głową"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Konfiguracja"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Wydajność"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Ekran"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Skórka"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "O..."
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Pomoc"
@@ -540,7 +540,7 @@ msgstr "Pomoc"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -552,32 +552,32 @@ msgid "Close"
msgstr "Zamknij"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Zmiana serwera"
@@ -591,7 +591,7 @@ msgstr "Zmiana serwera"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -608,37 +608,37 @@ msgid "Error"
msgstr "Błąd"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
@@ -678,7 +678,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Ogólny"
@@ -4557,46 +4557,57 @@ msgstr "Automatycznie przenoś imiona"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Pokaż przedmioty"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Bezpieczny handel"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Niebezpieczne znaki w imionach"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Pokaż statusy"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Pokaż adres IP na zrzutach ekranu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Ukryj nicki usuniętych graczy"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5776,8 +5787,14 @@ msgstr "%s obecny/a. %d graczy online."
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "zwierzątko gracza %s's"
diff --git a/po/pt.po b/po/pt.po
index a667c1319..6c8d6cc21 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -319,25 +319,25 @@ msgid "Visible on map"
msgstr "Visivel no mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "l"
@@ -487,37 +487,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -535,7 +535,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
@@ -586,7 +586,7 @@ msgstr "Mudando servidores do jogo"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Geral"
@@ -4551,46 +4551,57 @@ msgstr "Nomes de movimentos automáticos"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Mostar itens"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Trocas seguras"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Letras de nome inseguras"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Ver status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
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:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Ocultar nicks de jogadores apagados"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5767,8 +5778,14 @@ msgstr "Presentes: %s; %d jogadores estão presentes."
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02bc6f088..3339b8b40 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-06-20 11:04+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -47,7 +47,7 @@ msgstr "Arquivo enviado"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -332,25 +332,25 @@ msgid "Visible on map"
msgstr "Mapa visivel"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -500,37 +500,37 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Desempenho"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Sobre"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -548,7 +548,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
@@ -599,7 +599,7 @@ msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -616,37 +616,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
@@ -686,7 +686,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Geral"
@@ -4567,46 +4567,57 @@ msgstr "Mover nomes automaticamente"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Mostrar itens"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Negociações seguras"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Letras inseguras no nome"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Mostrar status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
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:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
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:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Esconder nicks de jogadores apagados"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
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:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5785,8 +5796,14 @@ msgstr "Presentes: %s; %d jogadores estão presentes."
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "Animal de estimação de %s"
diff --git a/po/ru.po b/po/ru.po
index 4394d9cba..3db800b9a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-11 11:22+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -44,7 +44,7 @@ msgstr "Файл выгружен"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -327,25 +327,25 @@ msgid "Visible on map"
msgstr "Видимые на карте"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "Б"
@@ -496,37 +496,37 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Производительность"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "О Программе"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Помощь"
@@ -544,7 +544,7 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -556,32 +556,32 @@ msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -595,7 +595,7 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -612,37 +612,37 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Регистрация удалена"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
@@ -682,7 +682,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_строка_цвета файл_назначения"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Общие"
@@ -4568,46 +4568,57 @@ msgstr "Автоматически сдвигать имена"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Показать предметы"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Защитить торговлю"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Небезопасные символы"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Показывать статусы"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Показывать ip адреса на снимках экрана"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr "Включить самолечение по клику мыши"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr "Группировать друзей в окне онлайн списка"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Спрятать имена стертых персонажей"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr "Использовать специальную диагональную скорость в передвижении игроков"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr "Эмулировать правую кнопку мыши при помощи долгого нажатия левой кнопки"
@@ -5786,8 +5797,14 @@ msgstr "Присутствуют: %s; Всего %d игроков."
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "животное %s'а"
diff --git a/po/sv.po b/po/sv.po
index 11851f7d7..bb3426bc7 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -316,25 +316,25 @@ msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -484,37 +484,37 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjälp"
@@ -532,7 +532,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -583,7 +583,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -600,37 +600,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
@@ -670,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "General"
@@ -4545,46 +4545,57 @@ msgstr "Auto-flytta namn"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Visa Items"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Säkra trades"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Osäkra tecken i namnen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Visa status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Visa ip-adress på skärmdumpar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Dölj raderade spelares nicks"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5761,8 +5772,14 @@ msgstr "Presentera: %s; %d spelare är presenterad."
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 11851f7d7..bb3426bc7 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -316,25 +316,25 @@ msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -484,37 +484,37 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjälp"
@@ -532,7 +532,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -583,7 +583,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -600,37 +600,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
@@ -670,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "General"
@@ -4545,46 +4545,57 @@ msgstr "Auto-flytta namn"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Visa Items"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Säkra trades"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Osäkra tecken i namnen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Visa status"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Visa ip-adress på skärmdumpar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
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:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Dölj raderade spelares nicks"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5761,8 +5772,14 @@ msgstr "Presentera: %s; %d spelare är presenterad."
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 4ed0ad024..14da095c7 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -35,7 +35,7 @@ msgstr "Dosya yüklendi"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -318,25 +318,25 @@ msgid "Visible on map"
msgstr "Haritada görünür"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "İnsan"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "kaçınıldı"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "kaçırıldı"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "İ"
@@ -486,37 +486,37 @@ msgstr "Yüzen balon"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Ayarlar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Performans"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Hakkında"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Yardım"
@@ -534,7 +534,7 @@ msgstr "Yardım"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
msgstr "Kapat"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Giriş yapılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Oyun sunucusu değiştiriliyor"
@@ -585,7 +585,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -602,37 +602,37 @@ msgid "Error"
msgstr "Hata"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Şifre Değiştir"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "E-posta Değiştir"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Kayıt silme başarılı"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
@@ -672,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Genel"
@@ -4550,46 +4550,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Nesneleri göster"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Güvenli takas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5757,8 +5768,14 @@ msgstr "Mevcut: %s; %d oyuncu mevcut."
msgid "Whispering to %s: %s"
msgstr "%s 'e fısıldanıyor: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index c23044344..cbf398bc0 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Файл завантажено"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -321,25 +321,25 @@ msgid "Visible on map"
msgstr "Видимий на мапі"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr "Людина"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "ухилення"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -490,37 +490,37 @@ msgstr "Плаваюча бульбашка"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "Налаштування"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Продуктивність"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "Відео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Теми"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr "Про програму"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Довідка"
@@ -538,7 +538,7 @@ msgstr "Довідка"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
msgstr "Закрити"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Очікування відповіді сервера"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Авторизація..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "Поринаємо в ігровий всесвіт..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "Завантаження списку персонажів..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "Приєднання до серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "Зміна ігрового серверу..."
@@ -589,7 +589,7 @@ msgstr "Зміна ігрового серверу..."
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -606,37 +606,37 @@ msgid "Error"
msgstr "Помилка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "Запитуємо деталі реєстрації"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "Змінити пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "Пароль змінено!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "Змінити імейл"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "Імейл змінено!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "Акаунт видалено"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "До побачення та вертайтесь."
@@ -676,7 +676,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_рядків_кольору файл_призначення"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "Загальне"
@@ -4555,46 +4555,57 @@ msgstr "Автоматичне переупорядкування імен гр
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "Показати спорядження"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr "Захистити торгівлю"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr "Небезпечні символи в іменах"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "Відображати статуси"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr "Додавати IP адреси до скріншоту (ГМ)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr "Лікувати самого себе за кліком миші"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr "Відокремлювати приятелів у вікні \"Хто онлайн\""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr "Ховати імена стертих гравців"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr "Вжити спеціальну діагональну швидкість під час руху"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5769,8 +5780,14 @@ msgstr "Присутні: %s; %d гравців онлайн."
msgid "Whispering to %s: %s"
msgstr "Шепчу до %s: %s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr "%s'ів улюбленець"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 01425b573..5a387846a 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: 2015-07-26 18:56+0300\n"
+"POT-Creation-Date: 2015-07-29 02:28+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -40,7 +40,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -323,25 +323,25 @@ msgid "Visible on map"
msgstr "在地图上可见"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:426
+#: src/being/being.cpp:435
msgid "Human"
msgstr ""
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "dodge"
msgstr "躲闪"
-#: src/being/being.cpp:600
+#: src/being/being.cpp:609
msgid "miss"
msgstr "失误"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1987 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2035 src/gui/windows/whoisonline.cpp:871
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1992 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2040 src/gui/windows/whoisonline.cpp:876
msgid "I"
msgstr "I"
@@ -490,37 +490,37 @@ msgstr "流动的泡沫"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:803 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/gui/windowmenu.cpp:177
#: src/gui/windows/setupwindow.cpp:64
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "视频"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "主题"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:815
+#: src/client.cpp:817
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:818 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "帮助"
@@ -538,7 +538,7 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
+#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1128
+#: src/client.cpp:1130
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1260
+#: src/client.cpp:1263
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1299
+#: src/client.cpp:1302
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1310
+#: src/client.cpp:1313
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
@@ -589,7 +589,7 @@ msgstr "正在更改游戏服务器"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
+#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:386
@@ -606,37 +606,37 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1403
+#: src/client.cpp:1406
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1446
+#: src/client.cpp:1449
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1448
+#: src/client.cpp:1451
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1479
+#: src/client.cpp:1482
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1481
+#: src/client.cpp:1484
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1511
+#: src/client.cpp:1514
msgid "Unregister Successful"
msgstr "取消注册成功"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1513
+#: src/client.cpp:1516
msgid "Farewell, come back any time..."
msgstr "再见,欢迎随时回来..."
@@ -676,7 +676,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
msgid "General"
msgstr "常规"
@@ -4547,46 +4547,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:73
+#, fuzzy
+msgid "Show badges"
+msgstr "显示项目"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Show badges at top"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
msgid "Secure trades"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:77
+#: src/gui/widgets/tabs/setup_players.cpp:85
msgid "Unsecure chars in names"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:81
+#: src/gui/widgets/tabs/setup_players.cpp:89
msgid "Show statuses"
msgstr "显示状态"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:85
+#: src/gui/widgets/tabs/setup_players.cpp:93
msgid "Show ip addresses on screenshots"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:89
+#: src/gui/widgets/tabs/setup_players.cpp:97
msgid "Allow self heal with mouse click"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:93
+#: src/gui/widgets/tabs/setup_players.cpp:101
msgid "Group friends in who is online window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:97
+#: src/gui/widgets/tabs/setup_players.cpp:105
msgid "Hide erased players nicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:101
+#: src/gui/widgets/tabs/setup_players.cpp:109
msgid "Use special diagonal speed in players moving"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:105
+#: src/gui/widgets/tabs/setup_players.cpp:113
msgid ""
"Emulate right mouse button by long mouse click (useful for touch interfaces)"
msgstr ""
@@ -5754,8 +5765,14 @@ msgstr ""
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
+#. TRANSLATORS: error message
+#: src/gui/windows/chatwindow.cpp:1566
+#, c-format
+msgid "Broken nick detected: %s"
+msgstr ""
+
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1738 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
#, c-format
msgid "%s's pet"
msgstr ""