Update translations.

24 files changed, 1165 insertions, 1327 deletions

diff --git a/po/ca.po b/po/ca.po
index bb4a595ff..d3f8556f7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Javier Muñoz Ramón <javier.mura84@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
 "Language: ca\n"
@@ -804,8 +804,8 @@ msgstr "Absent"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -814,7 +814,7 @@ msgstr "Absent"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -875,34 +875,27 @@ msgstr "Tanca"
 msgid "Do you want to open support page?"
 msgstr "Vol obrir la pàgina de suport?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Missatge"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviu"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Reviu"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Porteu més de la meitat del vostre pes. No podeu recuperar salut."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Porteu menys de la meitat del vostre pes. Podeu recuperar salut."
 
@@ -3462,9 +3455,8 @@ msgstr "Recompte d'agents al mapa:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Recompte d'agents al mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3785,21 +3777,18 @@ msgstr "So de missatge xiuxiueig"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "So de missatge global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "So de missatge d'error"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "So de missatge global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4969,9 +4958,8 @@ msgstr "Dreceres"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Dreceres"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6404,7 +6392,7 @@ msgstr "Les direccions de correu electrònic no coincideixen."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6493,7 +6481,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
@@ -6542,13 +6530,12 @@ msgstr "F"
 msgid "M"
 msgstr "M"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "C"
+#, fuzzy
+msgid "H"
+msgstr "XA"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6556,17 +6543,17 @@ msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Atributs de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Heu de suprimir %d punts"
@@ -6607,9 +6594,8 @@ msgstr "Juga"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Canvia inici de sessió"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6857,6 +6843,11 @@ msgstr "Insereix"
 msgid "Equip"
 msgstr "Equipa"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "C"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7413,9 +7404,8 @@ msgstr "Escolliu el vostre servidor  *** MODE SEGUR ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Escolliu el vostre servidor  *** MODE SEGUR ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7881,27 +7871,27 @@ msgid "Connecting..."
 msgstr "S'està connectant..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Mostra totes les novetats (això pot ser lent)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 El procés d'actualització és incomplet."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es recomana que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 ho torneu a intentar més tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Complet"
 
@@ -9887,28 +9877,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Introduïu contrasenya:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Estableix un nou codi PIN"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Estableix un nou codi PIN"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Canvia l'avís"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11625,3 +11611,6 @@ msgstr "%d segon"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
+
+#~ msgid "Message"
+#~ msgstr "Missatge"
diff --git a/po/cs.po b/po/cs.po
index 98f01d39f..b966b9683 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -810,8 +810,8 @@ msgstr "Pryč"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -820,7 +820,7 @@ msgstr "Pryč"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -881,34 +881,27 @@ msgstr "Zavřít"
 msgid "Do you want to open support page?"
 msgstr "Preješ si otevřít stránku podpory?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Zpráva"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Oživ"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
@@ -3469,9 +3462,8 @@ msgstr "Počet hráčů na mapě:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Počet hráčů na mapě:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3792,21 +3784,18 @@ msgstr "Zvuk šeptané zprávy"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Zvuk globálního oznámení"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Zvuk chybového oznámení"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Zvuk globálního oznámení"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4840,9 +4829,8 @@ msgstr "Knoflíky zkratek"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Knoflíky zkratek"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6273,7 +6261,7 @@ msgstr "Emailové adresy nesouhlasí."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6362,7 +6350,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
@@ -6411,13 +6399,12 @@ msgstr "P"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6425,17 +6412,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -6476,9 +6463,8 @@ msgstr "Hrát"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Změň přihlášení"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6721,6 +6707,11 @@ msgstr "Insert"
 msgid "Equip"
 msgstr "Vybavit"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7281,9 +7272,8 @@ msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7747,27 +7737,27 @@ msgid "Connecting..."
 msgstr "Připojuji se..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Zobrazit všecky novinky (může být pomalé)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -9751,28 +9741,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Zadej heslo:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Prosím nastavte nový pin kód"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Prosím nastavte nový pin kód"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Změnit mód zobrazení mapy"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11457,3 +11443,6 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
+
+#~ msgid "Message"
+#~ msgstr "Zpráva"
diff --git a/po/de.po b/po/de.po
index 1368384ea..52c5d2664 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,6 +22,7 @@
 # Jürgen, 2013
 # Kristin Joris <kristin.joris@gmail.com>, 2016
 # Larson März <larson@protonmail.ch>, 2017
+# Lawn Cable <transifex.lawncable.tmw2@simonlaux.de>, 2018
 # Marco Jäger <>, 2012
 # Marco Jäger <linuxcobra@gmx.de>, 2012
 # Mike Wollmann <jak89_1@ftb4u.de>, 2016
@@ -29,8 +30,8 @@
 # Necromonger <Necromong@inbox.ru>, 2011
 # Necromonger <Necromong@inbox.ru>, 2011
 # Nemo <nw-nemo@gmx.net>, 2015
-# Nessi <vanessabrolfs@gmail.com>, 2016
-# Nessi <vanessabrolfs@gmail.com>, 2016
+# Nessi, 2016
+# Nessi, 2016
 # Philipp <philipp.krueger1@googlemail.com>, 2012
 # Philipp <philipp.krueger1@googlemail.com>, 2012
 # Rosemarie Tauber <horos@online.de>, 2012
@@ -43,9 +44,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Kristin Joris <kristin.joris@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-06-24 21:54+0000\n"
+"Last-Translator: Lawn Cable <transifex.lawncable.tmw2@simonlaux.de>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -840,8 +841,8 @@ msgstr "Abwesend"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -850,7 +851,7 @@ msgstr "Abwesend"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -911,28 +912,21 @@ msgstr "Schließen"
 msgid "Do you want to open support page?"
 msgstr "Willst du die Unterstützungsseite öffnen?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Nachricht"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Wiederbeleben"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Wiederbeleben"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -940,7 +934,7 @@ msgstr ""
 "Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine "
@@ -3502,9 +3496,8 @@ msgstr "Anzahl aktiver Kartenobjekte:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Anzahl aktiver Kartenobjekte:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3825,21 +3818,18 @@ msgstr "Geräusch für Flüsternachrichten"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Geräusch für allgemeine Nachrichten"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Geräusch für Fehlermeldungen"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Geräusch für allgemeine Nachrichten"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -5008,9 +4998,8 @@ msgstr "Kurzbefehlknöpfe"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Kurzbefehlknöpfe"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6446,7 +6435,7 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6535,7 +6524,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
@@ -6584,13 +6573,12 @@ msgstr "W"
 msgid "M"
 msgstr "M"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "O"
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6598,17 +6586,17 @@ msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Charakterattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -6649,9 +6637,8 @@ msgstr "Spielen"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Login ändern"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6899,6 +6886,11 @@ msgstr "Einfügen"
 msgid "Equip"
 msgstr "Ausrüsten"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "O"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7236,7 +7228,7 @@ msgstr "Öffnen"
 #. TRANSLATORS: expired mail message prefix
 #: src/gui/windows/mailwindow.cpp:200
 msgid "(expired)"
-msgstr ""
+msgstr "(abgelaufen)"
 
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
@@ -7455,9 +7447,8 @@ msgstr "Wähle deinen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Wähle deinen Server  ***SICHERER MODUS ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7787,7 +7778,7 @@ msgstr "Job:"
 #: src/gui/windows/statuswindow.cpp:274
 #, c-format
 msgid "Level: %d (%s %d)"
-msgstr ""
+msgstr "Level: %d (%s %d)"
 
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:56
@@ -7925,27 +7916,27 @@ msgid "Connecting..."
 msgstr "Verbinde..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Alle Neuigkeiten anzeigen (Kann langsam sein)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Updateprozess wurde nicht abgeschlossen."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen, dass"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 du es später noch einmal versuchst."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Fertig"
 
@@ -9605,7 +9596,7 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:169
 msgid "You was banned."
-msgstr ""
+msgstr "Du wurdest gebannt."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:173 src/net/tmwa/generalrecv.cpp:79
@@ -9932,28 +9923,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Gib dein Passwort ein:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Bitte neuen Pincode eingeben"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Bitte neuen Pincode eingeben"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Notiz ändern"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11613,7 +11600,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr ""
+msgstr "%d Woche"
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11657,9 +11644,12 @@ msgstr "%d Minuten"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr ""
+msgstr "%d Sekunde"
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
+
+#~ msgid "Message"
+#~ msgstr "Nachricht"
diff --git a/po/eo.po b/po/eo.po
index e9a635693..65d168565 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
 "eo/)\n"
@@ -804,8 +804,8 @@ msgstr "For"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -814,7 +814,7 @@ msgstr "For"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -875,34 +875,27 @@ msgstr "Fermi"
 msgid "Do you want to open support page?"
 msgstr "Ĉu vi volas malfermi subtenan retpaĝon?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Mesaĝo"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviviĝi"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Reviviĝi"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Vi portas pli ol duonon de via pezo. Vi ne povas resaniĝi."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Vi portas malpli ol duonon de via pezo. Vi povas resaniĝi."
 
@@ -3462,9 +3455,8 @@ msgstr "Nombro de roluloj en mapo:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Nombro de roluloj en mapo:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3785,21 +3777,18 @@ msgstr "Sono de flustra mesaĝo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Sono de tutluda mesaĝo"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Sono de erara mesaĝo"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Sono de tutluda mesaĝo"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4950,9 +4939,8 @@ msgstr "Fulmoklavoj"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Fulmoklavoj"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6379,7 +6367,7 @@ msgstr "La retpoŝtadresoj ne kongruas."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6468,7 +6456,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bonvolu disdoni %d poentojn"
@@ -6517,13 +6505,12 @@ msgstr "A"
 msgid "M"
 msgstr "B"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "V"
+#, fuzzy
+msgid "H"
+msgstr "BAB"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6531,17 +6518,17 @@ msgid "U"
 msgstr "N"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Via nomo devas esti longa almenaŭ 4 signoj."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Avataraj atributoj bonas"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bonvolu forpreni %d poentojn"
@@ -6582,9 +6569,8 @@ msgstr "Ludi"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Ŝanĝi Saluton"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6827,6 +6813,11 @@ msgstr "Enmeti"
 msgid "Equip"
 msgstr "Surhavi"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "V"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7383,9 +7374,8 @@ msgstr "Elektu Vian Servilon *** SENDANĜERA REĜIMO ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Elektu Vian Servilon *** SENDANĜERA REĜIMO ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7852,27 +7842,27 @@ msgid "Connecting..."
 msgstr "Konektanta..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Montru ĉiujn novaĵojn (povas esti malrapida)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  Ĝisdatigo nefinfarita."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Estas ege rekomendita, ke"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  vi reprovu pli malfrue."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Finfarita"
 
@@ -9855,28 +9845,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Enigu pasvorton:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Bonvolu agordi novan PIN-on"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Bonvolu agordi novan PIN-on"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Ŝanĝi avizon"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11563,3 +11549,6 @@ msgstr "%d sekundo"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundoj"
+
+#~ msgid "Message"
+#~ msgstr "Mesaĝo"
diff --git a/po/es.po b/po/es.po
index dba441e63..d632ecf06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -824,8 +824,8 @@ msgstr "Lejos del Teclado"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -834,7 +834,7 @@ msgstr "Lejos del Teclado"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -895,28 +895,21 @@ msgstr "Cerrar"
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Mensaje"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Revivir"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -924,7 +917,7 @@ msgstr ""
 "salud."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
@@ -3485,9 +3478,8 @@ msgstr "Numero de agentes en el mapa:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Numero de agentes en el mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3808,21 +3800,18 @@ msgstr "Sonido de susurro"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Sonido de mensaje global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Sonido de mensaje de error"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Sonido de mensaje global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4995,9 +4984,8 @@ msgstr "Atajos"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Atajos"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6432,7 +6420,7 @@ msgstr "Las direcciones de correo suministradas no concuerdan."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6521,7 +6509,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
@@ -6570,13 +6558,12 @@ msgstr "F"
 msgid "M"
 msgstr "M"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "O"
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6584,17 +6571,17 @@ msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -6635,9 +6622,8 @@ msgstr "Jugar"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Cambiar de Login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6886,6 +6872,11 @@ msgstr "Insert"
 msgid "Equip"
 msgstr "Equipar"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "O"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7444,9 +7435,8 @@ msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Elige tu servidor  *** MODO SEGURO ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7912,27 +7902,27 @@ msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas las noticias (puede ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 El proceso de actualización está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Se recomienda encarecidamente que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Completado"
 
@@ -9920,28 +9910,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Ingrese contraseña:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Por favor, crea un nuevo código pin"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Por favor, crea un nuevo código pin"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Cambiar nota"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11640,3 +11626,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Message"
+#~ msgstr "Mensaje"
diff --git a/po/fi.po b/po/fi.po
index 923f0ead1..c32b6e109 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -802,8 +802,8 @@ msgstr "Poissa"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -812,7 +812,7 @@ msgstr "Poissa"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -873,33 +873,27 @@ msgstr "Sulje"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Viesti"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
@@ -3459,9 +3453,8 @@ msgstr "Toimijoita kartalla:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Toimijoita kartalla:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3782,9 +3775,8 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Kiltamestari: %s"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
@@ -6251,7 +6243,7 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6340,7 +6332,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
@@ -6389,13 +6381,12 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "PV"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6403,17 +6394,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -6454,9 +6445,8 @@ msgstr "Pelaa"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Vaihda kirjautumistietoja"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6699,6 +6689,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Ota käyttöön"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7255,9 +7250,8 @@ msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7721,27 +7715,27 @@ msgid "Connecting..."
 msgstr "Yhdistetään..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Valmis"
 
@@ -9722,9 +9716,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Salasana:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9739,9 +9732,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Vaihda karttanäkymää"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11429,3 +11421,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
+
+#~ msgid "Message"
+#~ msgstr "Viesti"
diff --git a/po/fr.po b/po/fr.po
index cebf19db0..b53eb5c6d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -31,9 +31,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-05-23 01:42+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-28 12:59+0000\n"
+"Last-Translator: Lucas Helaine <lucashelaine14@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -832,8 +832,8 @@ msgstr "Inactif"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -842,7 +842,7 @@ msgstr "Inactif"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -903,28 +903,21 @@ msgstr "Fermer"
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Message"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Ressusciter"
+msgstr "Résurection MJ"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -932,7 +925,7 @@ msgstr ""
 "en mesure de récupérer ta santé."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux "
@@ -3494,9 +3487,8 @@ msgstr "Nombre d'acteurs sur la carte :"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Nombre d'acteurs sur la carte :"
+msgstr "Nombre d'atlas de le carte:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3817,21 +3809,18 @@ msgstr "Son des messages privés"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Son des messages globaux"
+msgstr "Son du message de Guilde"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Son des messages d'erreur"
+msgstr "Son du message de groupe"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Son des messages globaux"
+msgstr "Son du message de Clan"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -5011,9 +5000,8 @@ msgstr "Boutons de raccourcis"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Boutons de raccourcis"
+msgstr "Afficher les icônes sur les boutons de raccourci"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6451,7 +6439,7 @@ msgstr "Les deux adresses mail ne sont pas identiques."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6540,7 +6528,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
@@ -6589,13 +6577,12 @@ msgstr "F"
 msgid "M"
 msgstr "H"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "O"
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6603,17 +6590,17 @@ msgid "U"
 msgstr "I"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -6654,9 +6641,8 @@ msgstr "Jouer"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Changer de Compte"
+msgstr "Changer le code PIN"
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6904,6 +6890,11 @@ msgstr "Insérer"
 msgid "Equip"
 msgstr "Équiper"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "O"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7241,7 +7232,7 @@ msgstr "Ouvrir"
 #. TRANSLATORS: expired mail message prefix
 #: src/gui/windows/mailwindow.cpp:200
 msgid "(expired)"
-msgstr ""
+msgstr "(expiré)"
 
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
@@ -7460,9 +7451,8 @@ msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Choisis ton serveur  *** Mode Sûr ***"
+msgstr "Choisi ton serveur *** MODE RENDU LOGICIEL ***"
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7934,27 +7924,27 @@ msgid "Connecting..."
 msgstr "Connexion..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Afficher toutes les nouvelles (peut être lent)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 Essayes de nouveau plus tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Terminé"
 
@@ -9938,47 +9928,43 @@ msgstr "Le poison n'a pas eu d'effet..."
 #: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
 #: src/pincodemanager.cpp:202
 msgid "Pincode"
-msgstr ""
+msgstr "Code PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Entre le mot de passe :"
+msgstr "Rentre ton code PIN"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Définis le nouveau code pin"
+msgstr "Nouveau code PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Définis le nouveau code pin"
+msgstr "Tape le nouveau code PIN"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Changer la notice"
+msgstr "Changer le code PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
 msgid "Enter old pincode"
-msgstr ""
+msgstr "Entrer l'ancien code PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
 msgid "Confirm new pincode"
-msgstr ""
+msgstr "Confirme le nouveau code PIN"
 
 #. TRANSLATORS: error message
 #: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
 msgid "Wrong pincode confirmation!"
-msgstr ""
+msgstr "Mauvais code PIN"
 
 #. TRANSLATORS: theme tab quick button
 #: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:927
@@ -11676,5 +11662,5 @@ msgstr "%d seconde"
 msgid "%d seconds"
 msgstr "%d secondes"
 
-#~ msgid "Guild / party / clan message sound"
-#~ msgstr "Son de message de la Guilde / Groupe / Clan "
+#~ msgid "Message"
+#~ msgstr "Message"
diff --git a/po/id.po b/po/id.po
index 6b8b4c3fe..0c0aabfbb 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Aviv wahyudin <apip45@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
 "Language: id\n"
@@ -804,8 +804,8 @@ msgstr "Pergi"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -814,7 +814,7 @@ msgstr "Pergi"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -875,35 +875,28 @@ msgstr "Tutup"
 msgid "Do you want to open support page?"
 msgstr "Kamu ingin membuka halaman bantuan?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Pesan"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Hidupkan"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Hidupkan"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 
@@ -3463,9 +3456,8 @@ msgstr "Jumlah aktor di peta:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Jumlah aktor di peta:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3786,21 +3778,18 @@ msgstr "Suara pesan bisikan"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Suara pesan global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Suara pesan error"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Suara pesan global"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -6254,7 +6243,7 @@ msgstr "Pengisian alamat email tidak cocok."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6343,7 +6332,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
@@ -6392,12 +6381,10 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
+msgid "H"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
@@ -6406,17 +6393,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -6457,9 +6444,8 @@ msgstr "Main"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Ubah"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6702,6 +6688,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Pakai"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7256,9 +7247,8 @@ msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Pilih Servermu *** SAFE MODE ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7722,27 +7712,27 @@ msgid "Connecting..."
 msgstr "Menyambung..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr ""
 
@@ -9720,9 +9710,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Masukkan sandi:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9737,9 +9726,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Ubah posisi di organisasi"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11426,3 +11414,6 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
+
+#~ msgid "Message"
+#~ msgstr "Pesan"
diff --git a/po/it.po b/po/it.po
index 2c7874aa6..5c24a3128 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: crifxer .\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
 "Language: it\n"
@@ -814,8 +814,8 @@ msgstr "Assente"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -824,7 +824,7 @@ msgstr "Assente"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -885,27 +885,21 @@ msgstr "Chiudi"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Messaggio"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -913,7 +907,7 @@ msgstr ""
 "vita."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
@@ -3474,9 +3468,8 @@ msgstr "Contatore generatori mappa:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Contatore generatori mappa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3797,21 +3790,18 @@ msgstr "Suono per il sussurro"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Suono per i messaggi globali"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Suono per gli errori"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Suono per i messaggi globali"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4845,9 +4835,8 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Mostra bottoni sullo schermo"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6274,7 +6263,7 @@ msgstr "Gli indirizzi email immessi non coincidono."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6363,7 +6352,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
@@ -6412,13 +6401,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "SH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6426,17 +6414,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -6477,9 +6465,8 @@ msgstr "Gioca"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Cambia login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6722,6 +6709,11 @@ msgstr "Insert"
 msgid "Equip"
 msgstr "Equipaggia"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7278,9 +7270,8 @@ msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7746,27 +7737,27 @@ msgid "Connecting..."
 msgstr "Connessione..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Completato"
 
@@ -9748,9 +9739,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Digitare password:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9765,9 +9755,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Cambia visualiz. mappa"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11455,3 +11444,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
+
+#~ msgid "Message"
+#~ msgstr "Messaggio"
diff --git a/po/ja.po b/po/ja.po
index 894c0e2be..f46ed4211 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -808,8 +808,8 @@ msgstr "アウェイ"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -818,7 +818,7 @@ msgstr "アウェイ"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -879,33 +879,27 @@ msgstr "閉じる"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "メッセージ"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
@@ -3465,9 +3459,8 @@ msgstr "マップアクターの数:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "マップアクターの数:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3788,21 +3781,18 @@ msgstr "ささやきメッセージ音"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "グローバルメッセージ音"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "エラーメッセージ音"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "グローバルメッセージ音"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4836,9 +4826,8 @@ msgstr "ショートカットボタン"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "ショートカットボタン"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6259,7 +6248,7 @@ msgstr "メールアドレスが一致しません."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6348,7 +6337,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
@@ -6397,13 +6386,12 @@ msgstr "友達"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "SH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6411,17 +6399,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -6462,9 +6450,8 @@ msgstr "プレイ"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "ログインの変更"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6707,6 +6694,11 @@ msgstr "挿入"
 msgid "Equip"
 msgstr "装着"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7261,9 +7253,8 @@ msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "サーバーを選んで下さい  *** セーフモード ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7729,27 +7720,27 @@ msgid "Connecting..."
 msgstr "接続しています..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "完了"
 
@@ -9731,9 +9722,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "パスワードを入力して下さい:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9748,9 +9738,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "マップビューモード変更"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11437,3 +11426,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d秒"
+
+#~ msgid "Message"
+#~ msgstr "メッセージ"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 8e41630ee..9fe17a694 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: 2018-05-23 04:44+0300\n"
+"POT-Creation-Date: 2018-06-30 22:45+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"
@@ -799,8 +799,8 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -809,7 +809,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -870,33 +870,27 @@ msgstr ""
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr ""
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -6243,7 +6237,7 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6332,7 +6326,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6381,12 +6375,10 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
+msgid "H"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
@@ -6395,17 +6387,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6690,6 +6682,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7711,27 +7708,27 @@ msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 403d64925..a7fb4b266 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -803,8 +803,8 @@ msgstr "Weg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -813,7 +813,7 @@ msgstr "Weg"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -874,27 +874,21 @@ msgstr "Sluiten"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Bericht"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -902,7 +896,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -3462,9 +3456,8 @@ msgstr "Aantal kaart-acteurs:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Aantal kaart-acteurs:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3785,15 +3778,13 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Guild leden"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Groep leden"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
@@ -6258,7 +6249,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6347,7 +6338,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6396,13 +6387,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6410,17 +6400,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6461,9 +6451,8 @@ msgstr "Spelen"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Wijzig Login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6706,6 +6695,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Uitrusten"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7262,9 +7256,8 @@ msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7730,27 +7723,27 @@ msgid "Connecting..."
 msgstr "Verbinden..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -9732,9 +9725,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Geef wachtwoord:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9749,9 +9741,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Wijzig Map Tonen Modus"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11438,3 +11429,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Message"
+#~ msgstr "Bericht"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 403d64925..a7fb4b266 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -803,8 +803,8 @@ msgstr "Weg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -813,7 +813,7 @@ msgstr "Weg"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -874,27 +874,21 @@ msgstr "Sluiten"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Bericht"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -902,7 +896,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -3462,9 +3456,8 @@ msgstr "Aantal kaart-acteurs:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Aantal kaart-acteurs:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3785,15 +3778,13 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Guild leden"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Groep leden"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
@@ -6258,7 +6249,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6347,7 +6338,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6396,13 +6387,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6410,17 +6400,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6461,9 +6451,8 @@ msgstr "Spelen"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Wijzig Login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6706,6 +6695,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Uitrusten"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7262,9 +7256,8 @@ msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7730,27 +7723,27 @@ msgid "Connecting..."
 msgstr "Verbinden..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -9732,9 +9725,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Geef wachtwoord:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9749,9 +9741,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Wijzig Map Tonen Modus"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11438,3 +11429,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Message"
+#~ msgstr "Bericht"
diff --git a/po/pl.po b/po/pl.po
index 7b0d91bc9..a3a86317f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -810,8 +810,8 @@ msgstr "AFK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -820,7 +820,7 @@ msgstr "AFK"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -881,35 +881,28 @@ msgstr "Zamknij"
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Wiadomość"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Wskrześ"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
@@ -3471,9 +3464,8 @@ msgstr "Licznik aktorów na mapie:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Licznik aktorów na mapie:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3794,21 +3786,18 @@ msgstr "Dźwięk szeptów"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Dźwięk globalnej wiadomości"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Dźwięk wiadomosci o błędzie"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Dźwięk globalnej wiadomości"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4842,9 +4831,8 @@ msgstr "Guziki skrótów"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Guziki skrótów"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6272,7 +6260,7 @@ msgstr "Pola adresu e-mail się nie zgadzają."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6361,7 +6349,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
@@ -6410,13 +6398,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "TX"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6424,17 +6411,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -6475,9 +6462,8 @@ msgstr "Graj"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Przeloguj się"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6720,6 +6706,11 @@ msgstr "Insert"
 msgid "Equip"
 msgstr "Załóż"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7280,9 +7271,8 @@ msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7748,27 +7738,27 @@ msgid "Connecting..."
 msgstr "Łączenie..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Pokazuj wszystkie wiadomości (może być wolne)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -9748,9 +9738,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Wprowadź hasło:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9765,9 +9754,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Zmień ogłoszenie"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11459,3 +11447,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
+
+#~ msgid "Message"
+#~ msgstr "Wiadomość"
diff --git a/po/pt.po b/po/pt.po
index f6107fc7a..2e81283ca 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: João Pereira <joaocrpereira@hotmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
 "Language: pt\n"
@@ -810,8 +810,8 @@ msgstr "Indisponivel"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -820,7 +820,7 @@ msgstr "Indisponivel"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -881,27 +881,21 @@ msgstr "Fechar"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Mensagem"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -909,7 +903,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos da metade de seu peso. Você vai recuperar-se "
@@ -3471,9 +3465,8 @@ msgstr "Jogadores no mapa:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Jogadores no mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3794,21 +3787,18 @@ msgstr "Som de mensagens de susurros"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Som de mensagens globais"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Som de mensagens de erro"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Som de mensagens globais"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4842,9 +4832,8 @@ msgstr "Botões de atalho"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Botões de atalho"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6269,7 +6258,7 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6358,7 +6347,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6407,13 +6396,12 @@ msgstr "A"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "JC"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6421,17 +6409,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6472,9 +6460,8 @@ msgstr "Jogar"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Trocar Login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6717,6 +6704,11 @@ msgstr "Inserir"
 msgid "Equip"
 msgstr "Equipar"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7273,9 +7265,8 @@ msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Escolha seu servidor    *** MODO SEGURO ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7740,27 +7731,27 @@ msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Concluído"
 
@@ -9742,9 +9733,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Entre com a senha:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9759,9 +9749,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Mudar o modo de visualização de mapas"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11448,3 +11437,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Message"
+#~ msgstr "Mensagem"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3848626e2..baf5cb6aa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@
 # freya <freya.df@gmail.com>, 2011-2012
 # freya <freya.df@gmail.com>, 2011,2013
 # Xtreem <guilhermegg11@hotmail.com>, 2014-2015
-# Jesusaves <cpntb1@ymail.com>, 2014,2016
+# Jesusaves <cpntb1@ymail.com>, 2014,2016,2018
 # Jesusaves <cpntb1@ymail.com>, 2014
 # Luciano Zago <lcnzg7@gmail.com>, 2013,2015
 # María Luciana Rolón <inactive+marialux@transifex.com>, 2012
@@ -28,9 +28,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-05-23 01:43+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-06-14 22:47+0000\n"
+"Last-Translator: Jesusaves <cpntb1@ymail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -349,7 +349,7 @@ msgstr "  -T --testes         : Começa a testar drivers e a auto-configurar"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
 msgid "  -V --validate       : Start validating client data"
-msgstr ""
+msgstr "  -V --validate       : Começa a validar dados do cliente"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:123
@@ -423,17 +423,17 @@ msgstr "Erro de conexão"
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
 msgid "Auto disable Show beings transparency"
-msgstr ""
+msgstr "Desativando transparência de seres automaticamente"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
 msgid "Auto lower Particle effects"
-msgstr ""
+msgstr "Reduzindo particulas automaticamente"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
 msgid "Auto enable opacity cache"
-msgstr ""
+msgstr "Habilitando cache de opacidade automaticamente"
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -824,8 +824,8 @@ msgstr "Indisponivel"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -834,7 +834,7 @@ msgstr "Indisponivel"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -895,28 +895,21 @@ msgstr "Fechar"
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Mensagem"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Reviver"
+msgstr "GM Reviver"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -924,7 +917,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
@@ -1212,7 +1205,7 @@ msgstr "Ukrainian"
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:89
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 #. TRANSLATORS: magic school
 #: src/gui/models/magicschoolmodel.h:35
@@ -1283,12 +1276,12 @@ msgstr "Inimigo"
 #. TRANSLATORS: server license comment
 #: src/gui/models/serverslistmodel.h:76
 msgid "(NON FREE)"
-msgstr ""
+msgstr "(NÃO LIVRE)"
 
 #. TRANSLATORS: server license comment
 #: src/gui/models/serverslistmodel.h:82
 msgid "(UNKNOWN)"
-msgstr ""
+msgstr "(DESCONHECIDO)"
 
 #. TRANSLATORS: buy dialog sort type.
 #: src/gui/models/sortlistmodelbuy.h:33
@@ -1377,7 +1370,7 @@ msgstr "Intimidade: %d"
 #: src/gui/popups/beingpopup.cpp:181
 #, c-format
 msgid "Group: %s (%d)"
-msgstr ""
+msgstr "Grupo GM: %s (%d)"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:192
@@ -1395,7 +1388,7 @@ msgstr "Guilda: %s"
 #: src/gui/popups/beingpopup.cpp:212
 #, c-format
 msgid "Clan: %s"
-msgstr ""
+msgstr "Clã: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1864,7 +1857,7 @@ msgstr "Roupas"
 #. TRANSLATORS: copy equipment from player to outfit
 #: src/gui/popups/popupmenu.cpp:869
 msgid "Copy from player"
-msgstr ""
+msgstr "Copiar do jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
@@ -2238,7 +2231,7 @@ msgstr "Habilidade"
 #. TRANSLATORS: add skill to shortcurs tab
 #: src/gui/popups/popupmenu.cpp:2282
 msgid "Add skill shortcut"
-msgstr ""
+msgstr "Adicionar atalho de habilidade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
@@ -2760,37 +2753,37 @@ msgstr "Quem descartou"
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3377
 msgid "Add 1"
-msgstr ""
+msgstr "Adicionar 1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3380
 msgid "Add 5"
-msgstr ""
+msgstr "Adicionar 5"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3383
 msgid "Add 10"
-msgstr ""
+msgstr "Adicionar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3386
 msgid "Add 100"
-msgstr ""
+msgstr "Adicionar 100"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3389
 msgid "Add 1000"
-msgstr ""
+msgstr "Adicionar 1000"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm create item
 #: src/gui/popups/popupmenu.cpp:3392
 msgid "Add 10000"
-msgstr ""
+msgstr "Adicionar 10000"
 
 #. TRANSLATORS: popup menu header
 #: src/gui/popups/popupmenu.cpp:3400
@@ -2852,7 +2845,7 @@ msgstr "Criar aliança"
 #. TRANSLATORS: change guild notice message
 #: src/gui/popups/popupmenu.cpp:3562
 msgid "Change notice"
-msgstr ""
+msgstr "Mudar mensagem de entrada"
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:145
@@ -3387,7 +3380,7 @@ msgstr "%s estão offline."
 #: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
-msgstr ""
+msgstr "Clã"
 
 #. TRANSLATORS: guild chat tab name
 #. TRANSLATORS: tab in social window
@@ -3418,22 +3411,22 @@ msgstr "Grupo"
 #. TRANSLATORS: not in clan label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:57
 msgid "Not in clan"
-msgstr ""
+msgstr "Não está em clã"
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
 msgid "Clan name"
-msgstr ""
+msgstr "Nome do Clã"
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
 msgid "Master name"
-msgstr ""
+msgstr "Nome do Mestre"
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
 msgid "Map name"
-msgstr ""
+msgstr "Nome do Mapa"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
@@ -3486,9 +3479,8 @@ msgstr "Jogadores no mapa:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Jogadores no mapa:"
+msgstr "Contagem de atlas de mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3785,7 +3777,7 @@ msgstr "Canais de Áudio"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Parallel number of sounds"
-msgstr ""
+msgstr "Número de sons paralelos"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_audio.cpp:124
@@ -3809,21 +3801,18 @@ msgstr "Som de mensagem de susurros"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Som de anuncios globais"
+msgstr "Som de mensagem de Aliança"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Som de mensagem de erro"
+msgstr "Som de mensagem de Grupo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Som de anuncios globais"
+msgstr "Som de mensagem de Clã"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4669,32 +4658,32 @@ msgstr "xxalta"
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:102
 msgid "verbose"
-msgstr ""
+msgstr "verbosidade"
 
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:104
 msgid "debug"
-msgstr ""
+msgstr "depurar"
 
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:106
 msgid "info"
-msgstr ""
+msgstr "info"
 
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:108
 msgid "warn"
-msgstr ""
+msgstr "aviso"
 
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:110
 msgid "error"
-msgstr ""
+msgstr "erro"
 
 #. TRANSLATORS: sdl2 log level
 #: src/gui/widgets/tabs/setup_misc.cpp:112
 msgid "critical"
-msgstr ""
+msgstr "crítico"
 
 #. TRANSLATORS: misc tab in settings
 #: src/gui/widgets/tabs/setup_misc.cpp:126
@@ -4980,7 +4969,7 @@ msgstr "Intervalo de repetição personalizado"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:413
 msgid "Enable alt-tab workaround"
-msgstr ""
+msgstr "Habilitar contorno ao alt-tab"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:425
@@ -4989,9 +4978,8 @@ msgstr "botões de atalho"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "botões de atalho"
+msgstr "Mostrar ícones nos botões de atalho"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -5011,12 +4999,12 @@ msgstr "Proxy endereço:porta"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
-msgstr ""
+msgstr "Túnel por Proxy HTTP"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
-msgstr ""
+msgstr "Logs"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:461
@@ -5036,7 +5024,7 @@ msgstr "Ignorar pacotes de registro"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
-msgstr ""
+msgstr "Logar pacotes não implementados"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:482
@@ -5051,7 +5039,7 @@ msgstr "Habilitar log de entrada"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
-msgstr ""
+msgstr "Nível de logs SDL"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
@@ -5182,12 +5170,12 @@ msgstr "Ativar exemplos de texturas (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:120
 msgid "Enable OpenGL context creation"
-msgstr ""
+msgstr "Habilitar criação de contexto OpenGL"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:125
 msgid "Enable OpenGL direct state access"
-msgstr ""
+msgstr "Habilitar acesso de estado direto OpenGL"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:131
@@ -5232,7 +5220,7 @@ msgstr "Opções Diversas (habilitar ou desabilitar pode melhorar desempenho)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:179
 msgid "Try first sdl driver (only for SDL2 default mode)"
-msgstr ""
+msgstr "Tentar antes driver sdl (apenas para modo padrão SDL2)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:186
@@ -5300,22 +5288,22 @@ msgstr "mostrar no fundo"
 #. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:61
 msgid "show"
-msgstr ""
+msgstr "mostrar"
 
 #. TRANSLATORS: visible name type
 #: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "show on selection"
-msgstr ""
+msgstr "mostrar na seleção"
 
 #. TRANSLATORS: show on top or down
 #: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "top"
-msgstr ""
+msgstr "topo"
 
 #. TRANSLATORS: show on top or down
 #: src/gui/widgets/tabs/setup_players.cpp:73
 msgid "bottom"
-msgstr ""
+msgstr "fundo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:90
@@ -5345,12 +5333,12 @@ msgstr "Jogadores(as) mortos(as) como alvo"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:117
 msgid "Show player names"
-msgstr ""
+msgstr "Mostrar nome de jogadores"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:125
 msgid "Show player names at"
-msgstr ""
+msgstr "Mostrar nome de jogadores em"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:131
@@ -5433,7 +5421,7 @@ msgstr "Habilitar comandos remotos"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:209
 msgid "Allow move character by mouse"
-msgstr ""
+msgstr "Permitir movimentação com o mouse"
 
 #. TRANSLATORS: quick tab in settings
 #. TRANSLATORS: settings tab name
@@ -5689,7 +5677,7 @@ msgstr "Detectar melhor modo"
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
-msgstr ""
+msgstr "Alto DPI"
 
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:106
@@ -5897,12 +5885,12 @@ msgstr "Ambiente FX"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:174
 msgid "Show particle effects"
-msgstr ""
+msgstr "Mostrar efeito de partículas"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:179
 msgid "Show particle effects from maps"
-msgstr ""
+msgstr "Mostrar efeitos de partícula dos mapas"
 
 #. TRANSLATORS: particle details
 #: src/gui/widgets/tabs/setup_visual.cpp:190
@@ -6286,18 +6274,18 @@ msgstr "Correio"
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:224
 msgid "CL"
-msgstr ""
+msgstr "CL"
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:230
 msgid "SI"
-msgstr ""
+msgstr "IS"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
 #: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
-msgstr ""
+msgstr "Informação do Servidor"
 
 #. TRANSLATORS: short button name for debug window.
 #: src/gui/windowmenu.cpp:236
@@ -6420,7 +6408,7 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6509,7 +6497,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6558,13 +6546,12 @@ msgstr "A"
 msgid "M"
 msgstr "M"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "O"
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6572,17 +6559,17 @@ msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6623,9 +6610,8 @@ msgstr "Jogar"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Trocar Login"
+msgstr "Mudar PIN"
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6648,6 +6634,11 @@ msgid ""
 "Experience: %s\n"
 "Money: %s"
 msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Nível: %u\n"
+"Experiência: %s\n"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:328
@@ -6704,12 +6695,12 @@ msgstr "Apelido suspeito detectado: "
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:67
 msgid "Ally"
-msgstr ""
+msgstr "Aliado"
 
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:69
 msgid "Antagonist"
-msgstr ""
+msgstr "Antagonista"
 
 #. TRANSLATORS: confirm dialog button
 #: src/gui/windows/confirmdialog.cpp:45
@@ -6817,7 +6808,7 @@ msgstr "Fontes"
 #. TRANSLATORS: emotes tab name
 #: src/gui/windows/emotewindow.cpp:137
 msgid "T"
-msgstr ""
+msgstr ":)"
 
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
@@ -6868,6 +6859,11 @@ msgstr "Inserir"
 msgid "Equip"
 msgstr "Equipar"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "O"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7032,14 +7028,14 @@ msgstr "Nível: %d em %f%%"
 #: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
-msgstr ""
+msgstr "Exp: %s/%s Falta: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
 #: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %s exp, média por monstro 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
@@ -7152,7 +7148,7 @@ msgstr "Exibir e-mail"
 #. TRANSLATORS: mail view attach / items button
 #: src/gui/windows/mailviewwindow.cpp:57
 msgid "Get items"
-msgstr ""
+msgstr "Obter itens"
 
 #: src/gui/windows/mailviewwindow.cpp:57
 msgid "Get attach"
@@ -7176,7 +7172,7 @@ msgstr "De:"
 #. TRANSLATORS: mail view attached money button
 #: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
-msgstr ""
+msgstr "Obter dinheiro"
 
 #. TRANSLATORS: mail window button
 #: src/gui/windows/mailwindow.cpp:68
@@ -7191,7 +7187,7 @@ msgstr "Novo"
 #. TRANSLATORS: mail window button
 #: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
-msgstr ""
+msgstr "Obter antigos"
 
 #: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
@@ -7205,7 +7201,7 @@ msgstr "Abrir"
 #. TRANSLATORS: expired mail message prefix
 #: src/gui/windows/mailwindow.cpp:200
 msgid "(expired)"
-msgstr ""
+msgstr "(expirou)"
 
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
@@ -7424,9 +7420,8 @@ msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Escolha seu servidor    *** MODO SEGURO ***"
+msgstr "Escolha Seu Servidor    *** MODO DE RENDERIZAÇÃO POR SOFTWARE ***"
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7468,22 +7463,22 @@ msgstr "requer v%s"
 #. TRANSLATORS: server info comment
 #: src/gui/windows/serverinfowindow.cpp:103
 msgid "##BServer with free license."
-msgstr ""
+msgstr "##BServidor com licença livre."
 
 #. TRANSLATORS: server info comment
 #: src/gui/windows/serverinfowindow.cpp:109
 msgid "##BServer with non free license."
-msgstr ""
+msgstr "##BServidor com licença não-livre."
 
 #. TRANSLATORS: server info comment
 #: src/gui/windows/serverinfowindow.cpp:116
 msgid "##BServer unknown license."
-msgstr ""
+msgstr "##BServidor com licença desconhecida."
 
 #. TRANSLATORS: server info comment
 #: src/gui/windows/serverinfowindow.cpp:122
 msgid "Server"
-msgstr ""
+msgstr "Servidor"
 
 #. TRANSLATORS: server info comment
 #. TRANSLATORS: Skill type
@@ -7495,17 +7490,17 @@ msgstr "Suporte"
 #. TRANSLATORS: server info non free comment
 #: src/gui/windows/serverinfowindow.cpp:132
 msgid "##BNon free sources"
-msgstr ""
+msgstr "##BRecursos não livres"
 
 #. TRANSLATORS: server info non free comment
 #: src/gui/windows/serverinfowindow.cpp:135
 msgid "##BFree sources"
-msgstr ""
+msgstr "##BRecursos livres"
 
 #. TRANSLATORS: server info documentation comment
 #: src/gui/windows/serverinfowindow.cpp:138
 msgid "##BDocumentation"
-msgstr ""
+msgstr "##BDocumentação"
 
 #. TRANSLATORS: setup button
 #: src/gui/windows/setupwindow.cpp:104
@@ -7756,7 +7751,7 @@ msgstr "Job:"
 #: src/gui/windows/statuswindow.cpp:274
 #, c-format
 msgid "Level: %d (%s %d)"
-msgstr ""
+msgstr "Nível: %d (%s %d)"
 
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:56
@@ -7891,27 +7886,27 @@ msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas as noticias (pode ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Concluído"
 
@@ -8504,12 +8499,12 @@ msgstr "Move animal de estimação para a direita"
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:95
 msgid "Move homunculus to master"
-msgstr ""
+msgstr "Mover homúnculo para mestre"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:101
 msgid "Move mercenary to master"
-msgstr ""
+msgstr "Mover mercenário para mestre"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:107
@@ -8868,27 +8863,27 @@ msgstr "Para IA do animal de estimação"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:432
 msgid "Feed homunculus"
-msgstr ""
+msgstr "Alimentar homúnculo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:438
 msgid "Feed pet"
-msgstr ""
+msgstr "Alimentar animal de estimação"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:444
 msgid "Drop pet's loot"
-msgstr ""
+msgstr "Descartar saque de pet"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:450
 msgid "Return pet to egg"
-msgstr ""
+msgstr "Retornar pet ao ovo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:456
 msgid "Unequip pet"
-msgstr ""
+msgstr "Desequipar pet"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:35
@@ -8898,22 +8893,22 @@ msgstr "Teclas de roupas"
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:41
 msgid "Wear outfit"
-msgstr ""
+msgstr "Vestir Roupas"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:53
 msgid "Copy Outfit to other outfit"
-msgstr ""
+msgstr "Copiar Roupas para outro conjunto"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:59
 msgid "Copy outfit to chat"
-msgstr ""
+msgstr "Copiar roupa para chat"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:65
 msgid "Copy equipped to outfit"
-msgstr ""
+msgstr "Copiar equipado para Roupas"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:71
@@ -9012,7 +9007,7 @@ msgstr "Janela de Ajuda"
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:70
 msgid "Server Info Window"
-msgstr ""
+msgstr "Janela de Informação do Servidor"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:76
@@ -9127,7 +9122,7 @@ msgstr "Janela de configurações rápidas"
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
 msgid "Clan window"
-msgstr ""
+msgstr "Janela do Clã"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9564,12 +9559,12 @@ msgstr "Raça não permitida."
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:165
 msgid "Access restricted in hours 00:00 to 06:00."
-msgstr ""
+msgstr "Acesso restrito de 00:00 às 06:00."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:169
 msgid "You was banned."
-msgstr ""
+msgstr "Você foi banido."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:173 src/net/tmwa/generalrecv.cpp:79
@@ -9892,47 +9887,43 @@ msgstr "Veneno não surtiu efeito..."
 #: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
 #: src/pincodemanager.cpp:202
 msgid "Pincode"
-msgstr ""
+msgstr "Código PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Entre com a senha:"
+msgstr "Digite seu Código PIN"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Por favor insira novo pincode"
+msgstr "Novo Código PIN"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Por favor insira novo pincode"
+msgstr "Digite novo Código Pin"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Mudar o modo de visualização de mapas"
+msgstr "Mudar Código Pin"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
 msgid "Enter old pincode"
-msgstr ""
+msgstr "Digite Código PIN antigo"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
 msgid "Confirm new pincode"
-msgstr ""
+msgstr "Confirme novo Código Pin"
 
 #. TRANSLATORS: error message
 #: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
 msgid "Wrong pincode confirmation!"
-msgstr ""
+msgstr "Confirmação de Código PIN errada!"
 
 #. TRANSLATORS: theme tab quick button
 #: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:927
@@ -9964,7 +9955,7 @@ msgstr "Arquivo enviado"
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
 msgid "Cache cleared"
-msgstr ""
+msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9983,7 +9974,7 @@ msgstr "Recursos de imagem:"
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
 msgid "Orphaned resource images:"
-msgstr ""
+msgstr "Imagens de recursos órfãos: "
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9993,28 +9984,30 @@ msgstr "Variáveis de ambiente despejada"
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
 msgid "Config uploaded to:"
-msgstr ""
+msgstr "Configuração enviada para: "
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
 msgid "Server config Uploaded to:"
-msgstr ""
+msgstr "Configuração do servidor enviada para:"
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
 msgid "Log uploaded to:"
-msgstr ""
+msgstr "Logs enviados para:"
 
 #. TRANSLATORS: last seen disabled warning
 #: src/progs/manaplus/actions/actions.cpp:1942
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
+"Ultima vez desabilitado. Habilite em jogadores / coletar ID de jogadores e "
+"log de visualização."
 
 #. TRANSLATORS: last seen error
 #: src/progs/manaplus/actions/actions.cpp:1963
 msgid "You have never seen this nick."
-msgstr ""
+msgstr "Você nunca viu este nick."
 
 #. TRANSLATORS: last seen message
 #: src/progs/manaplus/actions/actions.cpp:1971
@@ -10025,7 +10018,7 @@ msgstr "Visto pela última vez por %s: %s"
 #. TRANSLATORS: last seen error
 #: src/progs/manaplus/actions/actions.cpp:1982
 msgid "You have not seen this nick before."
-msgstr ""
+msgstr "Você não viu esse nick antes."
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10086,13 +10079,13 @@ msgstr "chapéu %s equipado."
 #. TRANSLATORS: dialog header
 #: src/progs/manaplus/actions/chat.cpp:695
 msgid "Guild notice"
-msgstr ""
+msgstr "Notícia da Aliança"
 
 #. TRANSLATORS: translation error message
 #: src/progs/manaplus/actions/chat.cpp:747
 #, c-format
 msgid "No translation found for string: %s"
-msgstr ""
+msgstr "Nenhuma tradução para: %s"
 
 #. TRANSLATORS: change relation
 #: src/progs/manaplus/actions/commands.cpp:158
@@ -10245,22 +10238,22 @@ msgstr "Compartilhamento de experiência desconhecido."
 #. TRANSLATORS: chat message
 #: src/progs/manaplus/actions/commands.cpp:1950
 msgid "Auto item sharing enabled."
-msgstr ""
+msgstr "Compartilhamento de itens Ativo."
 
 #. TRANSLATORS: chat message
 #: src/progs/manaplus/actions/commands.cpp:1957
 msgid "Auto item sharing disabled."
-msgstr ""
+msgstr "Compartilhamento de itens inAtivo."
 
 #. TRANSLATORS: chat message
 #: src/progs/manaplus/actions/commands.cpp:1964
 msgid "Auto item sharing not possible."
-msgstr ""
+msgstr "Compartilhamento de itens impossível."
 
 #. TRANSLATORS: chat message
 #: src/progs/manaplus/actions/commands.cpp:1971
 msgid "Auto item sharing unknown."
-msgstr ""
+msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: dialog header
 #: src/progs/manaplus/actions/pets.cpp:87
@@ -10915,7 +10908,7 @@ msgstr "Carta inserida."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:424
 msgid "Bank check failed. Bank probably disabled."
-msgstr ""
+msgstr "Falha ao checar Banco. O banco provavelmente está desativado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:428
@@ -11414,99 +11407,99 @@ msgstr "Erro ao salvar localização. Você não possui a habilidade warp."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:839
 msgid "Unable to buy while trading."
-msgstr ""
+msgstr "Impossível comprar enquanto negocia."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:846
 msgid "Unable to buy. Npc not found."
-msgstr ""
+msgstr "Impossível comprar, NPC não encontrado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:850
 msgid "Unable to buy. Shop system error."
-msgstr ""
+msgstr "Impossível comprar. Erro no sistema de Lojas."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:854
 msgid "Unable to buy. Wrong items selected."
-msgstr ""
+msgstr "Impossível comprar, seleção de itens incorreta."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:858
 #, c-format
 msgid "Mail destination name %s is wrong."
-msgstr ""
+msgstr "Nome de destinatário %s está errado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:862
 msgid "Item attach failed. Weight too big."
-msgstr ""
+msgstr "Falhou ao anexar item. Muito pesado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:866
 msgid "Item attach failed. Fatal error."
-msgstr ""
+msgstr "Falhou ao anexar item. Erro fatal."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:870
 msgid "Item attach failed. No more space."
-msgstr ""
+msgstr "Falhou ao anexar item. Não há espaço."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:874
 msgid "Item attach failed. Item on tradeable."
-msgstr ""
+msgstr "Falhou ao anexar item. Item em negociação."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:878
 msgid "Item attach failed. Unknown error."
-msgstr ""
+msgstr "Falhou ao anexar item. Erro desconhecido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:882
 #, c-format
 msgid "Item %s remove failed."
-msgstr ""
+msgstr "Falhou ao remover item %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:886
 msgid "Mail send failed. Fatal error."
-msgstr ""
+msgstr "Falhou ao enviar mensagem. Erro fatal."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:890
 msgid "Mail send failed. Too many mails sent."
-msgstr ""
+msgstr "Falhou ao enviar mensagem. Muitos emails enviados."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:894
 msgid "Mail send failed. Wrong attach found."
-msgstr ""
+msgstr "Falhou ao enviar mensagem. Anexos incorretos."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:898
 msgid "Mail send failed. Receiver name wrong or not checked."
-msgstr ""
+msgstr "Falhou ao enviar mensagem. Destinatário incorreto ou não conferido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:902
 msgid "Error on getting attach. No space or weight too high."
-msgstr ""
+msgstr "Erro ao anexar. Nenhum espaço ou muito pesado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:906
 msgid "You got money from mail."
-msgstr ""
+msgstr "Você recebeu dinheiro da mensagem."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:910
 msgid "Error on getting money attach."
-msgstr ""
+msgstr "Erro ao receber dinheiro da mensagem."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:914
 msgid "Error on getting money attach. Too many money."
-msgstr ""
+msgstr "Erro ao receber dinheiro da mensagem. Dinheiro demais."
 
 #. TRANSLATORS: skill level
 #: src/resources/skill/skillinfo.cpp:113
@@ -11563,7 +11556,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr ""
+msgstr "%d semana(s)"
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11596,7 +11589,7 @@ msgstr "%d Horas"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr ""
+msgstr "%d minuto(s)"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11607,9 +11600,12 @@ msgstr "%d Minutos"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr ""
+msgstr "%d segundo(s)"
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
+
+#~ msgid "Message"
+#~ msgstr "Mensagem"
diff --git a/po/ru.po b/po/ru.po
index cb39c9b03..26e70fe13 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 # Translators:
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2015
 # Alexsl <alexlsh@mail.ru>, 2013-2015
-# Andrei Karas <akaras@inbox.ru>, 2011-2017
+# Andrei Karas <akaras@inbox.ru>, 2011-2018
 # Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
 # John Smith <torck777@safe-mail.net>, 2014
 # kaban kabanovich <slaytor@gmail.com>, 2016
@@ -13,7 +13,7 @@
 # Necromonger <Necromong@inbox.ru>, 2011
 # Necromonger <Necromong@inbox.ru>, 2011
 # Yummie <reslayer@mail.ru>, 2011
-# Victor <ratrex@mail.ru>, 2016-2017
+# RatreX <ratrex@mail.ru>, 2016-2018
 # Yummie <reslayer@mail.ru>, 2011
 # Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
 # Роман Верменко <dargodet@gmail.com>, 2015
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-06-18 19:23+0000\n"
+"Last-Translator: RatreX <ratrex@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
 "Language: ru\n"
@@ -68,7 +68,7 @@ msgstr "Б"
 #: src/being/localplayer.cpp:406 src/net/eathena/playerrecv.cpp:517
 #, c-format
 msgid "You were killed by %s."
-msgstr "Вы были убиты %s."
+msgstr "Вас убил %s."
 
 #. TRANSLATORS: pickup error message
 #: src/being/localplayer.cpp:890
@@ -418,17 +418,17 @@ msgstr "Ошибка сети"
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
 msgid "Auto disable Show beings transparency"
-msgstr ""
+msgstr "Отключать автоматически прозрачность персонажей"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
 msgid "Auto lower Particle effects"
-msgstr ""
+msgstr "Автоматически понижать эффекты частиц"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
 msgid "Auto enable opacity cache"
-msgstr ""
+msgstr "Включать автоматически кэш прозрачности"
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -819,8 +819,8 @@ msgstr "Отошел"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -829,7 +829,7 @@ msgstr "Отошел"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -890,28 +890,21 @@ msgstr "Закрыть"
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Сообщение"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Оживить"
+msgstr "ГМ оживление"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -919,7 +912,7 @@ msgstr ""
 "восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
@@ -1390,7 +1383,7 @@ msgstr "Гильдия: %s"
 #: src/gui/popups/beingpopup.cpp:212
 #, c-format
 msgid "Clan: %s"
-msgstr ""
+msgstr "Клан: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -3382,7 +3375,7 @@ msgstr "%s вышел(а)."
 #: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
-msgstr ""
+msgstr "Клан"
 
 #. TRANSLATORS: guild chat tab name
 #. TRANSLATORS: tab in social window
@@ -3413,22 +3406,22 @@ msgstr "Группа"
 #. TRANSLATORS: not in clan label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:57
 msgid "Not in clan"
-msgstr ""
+msgstr "Не в клане"
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
 msgid "Clan name"
-msgstr ""
+msgstr "Имя клана"
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
 msgid "Master name"
-msgstr ""
+msgstr "Имя мастера"
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
 msgid "Map name"
-msgstr ""
+msgstr "Карта"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
@@ -3481,9 +3474,8 @@ msgstr "Кол-во. объектов:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Кол-во. объектов:"
+msgstr "Кол-во атласов на карте:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3804,21 +3796,18 @@ msgstr "Звук приватного сообщения"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Звук глобального сообщения"
+msgstr "Звук сообщения в гильдии"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Звук ошибки"
+msgstr "Звук сообщения в группе"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Звук глобального сообщения"
+msgstr "Звук сообщения в клане"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4016,6 +4005,10 @@ msgid ""
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
 msgstr ""
+"Если вы включите эту опцию, логи чата будут записаны на диск.\n"
+"\n"
+"Примечание: логи чата могут занять заметное количество дискового "
+"пространства."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:143
@@ -4055,6 +4048,11 @@ msgid ""
 "This adds some extra noise to chat, but allows one to see when your buddies "
 "are coming online."
 msgstr ""
+"Если эта опция включена, изменение онлайн статуса членов группы будет "
+"показано в чате во вкладке группы.\n"
+"\n"
+"Добавляет дополнительные уведомления в чат, но позволяет видеть, когда ваши "
+"друзья выходят в сеть."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:167
@@ -4070,6 +4068,11 @@ msgid ""
 "This adds some extra noise to chat, but allows one to see when your buddies "
 "are coming online."
 msgstr ""
+"Если эта опция включена, изменение онлайн статуса членов гильдии будет "
+"показано в чате во вкладке гильдии.\n"
+"\n"
+"Добавляет дополнительные уведомления в чат, но позволяет видеть, когда ваши "
+"друзья выходят в сеть."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:177
@@ -4092,6 +4095,14 @@ msgid ""
 "special content. If you disable this setting, you will be able to see these "
 "messages and get idea when other players are looking at your shop."
 msgstr ""
+"Если эта опция включена, никакие сообщения, связанные со встроенным "
+"магазином ManaPlus, не будут отображаться в чате. Выключите эту опцию, если "
+"вы хотите видеть сообщения магазина.\n"
+"\n"
+"Примечание: технически магазин ManaPlus реализован как обычные личные "
+"сообщения со специальным контентом. Если вы отключите эту опцию, вы сможете "
+"увидеть эти сообщения и получить представление о том, когда другие игроки "
+"смотрят ваш магазин."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:193
@@ -4202,6 +4213,10 @@ msgid ""
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
+"Если эта опция включена, появится вкладка языка, если сервер поддерживает "
+"данную возможность.\n"
+"\n"
+"Примечание: пока поддерживается только сервером Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:265
@@ -4884,9 +4899,8 @@ msgstr "Кнопки"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Кнопки"
+msgstr "Показывать значки на верхних кнопках"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -4906,7 +4920,7 @@ msgstr "Прокси адрес:порт"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
-msgstr ""
+msgstr "Туннель через HTTP прокси"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:457
@@ -6186,7 +6200,7 @@ msgstr "Почта"
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:224
 msgid "CL"
-msgstr ""
+msgstr "КЛ"
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:230
@@ -6320,7 +6334,7 @@ msgstr "Адрес E-mail не совпадает."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6409,7 +6423,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
@@ -6458,13 +6472,12 @@ msgstr "Д"
 msgid "M"
 msgstr "М"
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr "Н"
+#, fuzzy
+msgid "H"
+msgstr "ЧАТ"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6472,17 +6485,17 @@ msgid "U"
 msgstr "?"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -6523,9 +6536,8 @@ msgstr "Играть"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Сменить логин"
+msgstr "Сменить пин"
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6548,6 +6560,11 @@ msgid ""
 "Experience: %s\n"
 "Money: %s"
 msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Уровень: %u\n"
+"Опыт: %s\n"
+"Деньги: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:328
@@ -6604,12 +6621,12 @@ msgstr "Обнаружен некорректный ник: "
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:67
 msgid "Ally"
-msgstr ""
+msgstr "Аллианс"
 
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:69
 msgid "Antagonist"
-msgstr ""
+msgstr "Проивник"
 
 #. TRANSLATORS: confirm dialog button
 #: src/gui/windows/confirmdialog.cpp:45
@@ -6768,6 +6785,11 @@ msgstr "Вставка"
 msgid "Equip"
 msgstr "Надеть"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr "Н"
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -6936,14 +6958,14 @@ msgstr "Уровень: %d на %f%%"
 #: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
-msgstr ""
+msgstr "Опыт: %s/%s Осталось: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
 #: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %s опыта, среднее кол-во мобов для 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
@@ -7109,7 +7131,7 @@ msgstr "Открыть"
 #. TRANSLATORS: expired mail message prefix
 #: src/gui/windows/mailwindow.cpp:200
 msgid "(expired)"
-msgstr ""
+msgstr "(просрочено)"
 
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
@@ -7328,9 +7350,8 @@ msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
+msgstr "Выбор сервера  *** ПРОГРАММНАЯ ОТРИСОВКА ***"
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7796,27 +7817,27 @@ msgid "Connecting..."
 msgstr "Соединение..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Показать все новости (может быть медленным)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Завершено"
 
@@ -9032,7 +9053,7 @@ msgstr "Окно быстрых настроек"
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
 msgid "Clan window"
-msgstr ""
+msgstr "Окно клана"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9467,12 +9488,12 @@ msgstr "Некорректная расса."
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:165
 msgid "Access restricted in hours 00:00 to 06:00."
-msgstr ""
+msgstr "Доступ запрещен в часы с 00:00 по 06:00."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:169
 msgid "You was banned."
-msgstr ""
+msgstr "Вы были забанены"
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:173 src/net/tmwa/generalrecv.cpp:79
@@ -9795,47 +9816,43 @@ msgstr "Яд не подействовал..."
 #: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
 #: src/pincodemanager.cpp:202
 msgid "Pincode"
-msgstr ""
+msgstr "Пинкод"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Введите пароль:"
+msgstr "Введите пин-код"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Пожалуйста, установите новый пин код"
+msgstr "Новый пин-код"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Пожалуйста, установите новый пин код"
+msgstr "Введите новый пин-код"
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Сменить сообщение"
+msgstr "Смена пинкода"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
 msgid "Enter old pincode"
-msgstr ""
+msgstr "Введите старый пин-код"
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
 msgid "Confirm new pincode"
-msgstr ""
+msgstr "Подтвердите новый пин-код"
 
 #. TRANSLATORS: error message
 #: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
 msgid "Wrong pincode confirmation!"
-msgstr ""
+msgstr "Ошибка подтверждения пин-кода"
 
 #. TRANSLATORS: theme tab quick button
 #: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:927
@@ -9867,7 +9884,7 @@ msgstr "Файл выгружен"
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
 msgid "Cache cleared"
-msgstr ""
+msgstr "Кэш очищен"
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9886,7 +9903,7 @@ msgstr "Изображений:"
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
 msgid "Orphaned resource images:"
-msgstr ""
+msgstr "Потерянные изображения"
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9896,28 +9913,30 @@ msgstr "Переменные среды сохранены"
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
 msgid "Config uploaded to:"
-msgstr ""
+msgstr "Когфигурациооный файл выгружен в:"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
 msgid "Server config Uploaded to:"
-msgstr ""
+msgstr "Серверный конфигурационный файл выгружен в:"
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
 msgid "Log uploaded to:"
-msgstr ""
+msgstr "Лог файл выгружен в:"
 
 #. TRANSLATORS: last seen disabled warning
 #: src/progs/manaplus/actions/actions.cpp:1942
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
+"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
+"игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
 #: src/progs/manaplus/actions/actions.cpp:1963
 msgid "You have never seen this nick."
-msgstr ""
+msgstr "Вам не встречался этот ник."
 
 #. TRANSLATORS: last seen message
 #: src/progs/manaplus/actions/actions.cpp:1971
@@ -9928,7 +9947,7 @@ msgstr "Последняя встреча с %s: %s"
 #. TRANSLATORS: last seen error
 #: src/progs/manaplus/actions/actions.cpp:1982
 msgid "You have not seen this nick before."
-msgstr ""
+msgstr "Вам не встречался этот ник."
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10815,7 +10834,7 @@ msgstr "Карточка вставлена."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:424
 msgid "Bank check failed. Bank probably disabled."
-msgstr ""
+msgstr "Ошибка при проверке банка. Возможно банк отключен."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:428
@@ -11514,3 +11533,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Message"
+#~ msgstr "Сообщение"
diff --git a/po/sr.po b/po/sr.po
index 812fe65cd..c17081cb1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -803,8 +803,8 @@ msgstr "Nedostupan"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -813,7 +813,7 @@ msgstr "Nedostupan"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -874,33 +874,27 @@ msgstr "Zatvori"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr ""
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -3460,9 +3454,8 @@ msgstr "Broj aktera na mapi:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Broj aktera na mapi:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -6250,7 +6243,7 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6339,7 +6332,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6388,12 +6381,10 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
+msgid "H"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
@@ -6402,17 +6393,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6453,9 +6444,8 @@ msgstr ""
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Promeni tip kretanja"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6698,6 +6688,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Obuci"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7721,27 +7716,27 @@ msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr ""
 
@@ -9735,9 +9730,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Promeni režim imitacije"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
diff --git a/po/sv.po b/po/sv.po
index 69571ecc5..04cff6d8c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
 "Language: sv_SE\n"
@@ -803,8 +803,8 @@ msgstr "Iväg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -813,7 +813,7 @@ msgstr "Iväg"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -874,34 +874,27 @@ msgstr "Stäng"
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Meddelande"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Återuppliva"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
@@ -3461,9 +3454,8 @@ msgstr "Kartmarkörsantal:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Kartmarkörsantal:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3784,21 +3776,18 @@ msgstr "Viskningsmeddelande-ljud"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Globalmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Felmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Globalmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4833,9 +4822,8 @@ msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Genvägsknappar"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6260,7 +6248,7 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6349,7 +6337,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6398,13 +6386,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6412,17 +6399,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6463,9 +6450,8 @@ msgstr "Spela"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Ändra login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6710,6 +6696,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Equip"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7266,9 +7257,8 @@ msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Välj din server *** FELSÄKERT LÄGE ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7734,27 +7724,27 @@ msgid "Connecting..."
 msgstr "Ansluter..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Färdig"
 
@@ -9737,9 +9727,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Skriv lösenord:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9754,9 +9743,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Ändra Kartvy-läge"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11443,3 +11431,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Message"
+#~ msgstr "Meddelande"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 69571ecc5..04cff6d8c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
 "Language: sv_SE\n"
@@ -803,8 +803,8 @@ msgstr "Iväg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -813,7 +813,7 @@ msgstr "Iväg"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -874,34 +874,27 @@ msgstr "Stäng"
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Meddelande"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Återuppliva"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
@@ -3461,9 +3454,8 @@ msgstr "Kartmarkörsantal:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Kartmarkörsantal:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3784,21 +3776,18 @@ msgstr "Viskningsmeddelande-ljud"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Globalmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Felmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Globalmeddelande-ljud"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4833,9 +4822,8 @@ msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Genvägsknappar"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6260,7 +6248,7 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6349,7 +6337,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6398,13 +6386,12 @@ msgstr "F"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "CH"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6412,17 +6399,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6463,9 +6450,8 @@ msgstr "Spela"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Ändra login"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6710,6 +6696,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Equip"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7266,9 +7257,8 @@ msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Välj din server *** FELSÄKERT LÄGE ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7734,27 +7724,27 @@ msgid "Connecting..."
 msgstr "Ansluter..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Färdig"
 
@@ -9737,9 +9727,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Skriv lösenord:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9754,9 +9743,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Ändra Kartvy-läge"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11443,3 +11431,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Message"
+#~ msgstr "Meddelande"
diff --git a/po/tr.po b/po/tr.po
index 3af6d0908..5ccaab1f0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Oben Devin Çetiner <hiironohige@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
 "Language: tr\n"
@@ -802,8 +802,8 @@ msgstr "Uzakta"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -812,7 +812,7 @@ msgstr "Uzakta"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -873,28 +873,21 @@ msgstr "Kapat"
 msgid "Do you want to open support page?"
 msgstr "Destek sayfasını açmak ister misin?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Mesaj"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Dirilt"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Dirilt"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -902,7 +895,7 @@ msgstr ""
 "iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden "
@@ -3464,9 +3457,8 @@ msgstr "Haritadaki oyuncu sayısı:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Haritadaki oyuncu sayısı:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3787,9 +3779,8 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Lonca yaratıldı."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
@@ -6256,7 +6247,7 @@ msgstr "E-posta adresleri uyuşmuyor."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6345,7 +6336,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
@@ -6394,13 +6385,12 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "KY"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6408,17 +6398,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -6459,9 +6449,8 @@ msgstr "Oyna"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Hesabı Değiştir"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6704,6 +6693,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Donatmak"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7727,27 +7721,27 @@ msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 Güncelleme işlemi tamamlanamadı."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Şiddetle tavsiye edilir ki"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1 daha sonra tekrar deneyiniz."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -9741,9 +9735,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Harita Görüş Modunu değiştir"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11429,3 +11422,6 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
+
+#~ msgid "Message"
+#~ msgstr "Mesaj"
diff --git a/po/uk.po b/po/uk.po
index 0a35173bc..e4b0a9a97 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: William Lee <v4r@trioptimum.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
 "Language: uk\n"
@@ -809,8 +809,8 @@ msgstr "Відсутній"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -819,7 +819,7 @@ msgstr "Відсутній"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -880,28 +880,21 @@ msgstr "Закрити"
 msgid "Do you want to open support page?"
 msgstr "Чи бажаєте відвідати сторінку підтримки?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "Повідомлення"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Опритомнити"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "Опритомнити"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -909,7 +902,7 @@ msgstr ""
 "зможете відновлюватися."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Ви навантажені менш, ніж на половину. Тепер ви можете відновлюватися."
 
@@ -3469,9 +3462,8 @@ msgstr "Кількість об'єктів:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "Кількість об'єктів:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3792,21 +3784,18 @@ msgstr "Звук приватного повідомлення"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "Звук глобального оповіщення"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "Звук помилки"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-#, fuzzy
 msgid "Clan message sound"
-msgstr "Звук глобального оповіщення"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
@@ -4840,9 +4829,8 @@ msgstr "Клавіші"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_misc.cpp:430
-#, fuzzy
 msgid "Show icons on shortcut buttons"
-msgstr "Клавіші"
+msgstr ""
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_misc.cpp:436
@@ -6268,7 +6256,7 @@ msgstr "Адреси скриньок не спідпадають."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6357,7 +6345,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Будь ласка, розподіліть %d балів"
@@ -6406,13 +6394,12 @@ msgstr "П"
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
-msgstr ""
+#, fuzzy
+msgid "H"
+msgstr "ЧАТ"
 
 #. TRANSLATORS: one char size unknown character gender
 #: src/gui/windows/charcreatedialog.cpp:300
@@ -6420,17 +6407,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ім'я повинно містити принаймні 4 символи."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "Характеристики персонажа в нормі"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "Будь ласка, видаліть %d балів"
@@ -6471,9 +6458,8 @@ msgstr "Увійти"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "Заміна"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6716,6 +6702,11 @@ msgstr "Вставити"
 msgid "Equip"
 msgstr "Вдягнути"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7276,9 +7267,8 @@ msgstr "Вибрати сервер  *** БЕЗПЕЧНИЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "Вибрати сервер  *** БЕЗПЕЧНИЙ РЕЖИМ ***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7742,27 +7732,27 @@ msgid "Connecting..."
 msgstr "З'єднуюсь..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr "Показати всі новини (може бути повільним)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процес поновлення не завершився."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настійно рекомендовано"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr "##1  спробувати ще раз пізніше."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "Завершено"
 
@@ -9742,28 +9732,24 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "Пароль:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
-#, fuzzy
 msgid "New pincode"
-msgstr "Будь ласка, встановіть новий пін код"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
-#, fuzzy
 msgid "Enter new pincode"
-msgstr "Будь ласка, встановіть новий пін код"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "Змінити режим мапи"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11452,3 +11438,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Message"
+#~ msgstr "Повідомлення"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4bb04702b..ba954be20 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -806,8 +806,8 @@ msgstr "距离"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -816,7 +816,7 @@ msgstr "距离"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -877,33 +877,27 @@ msgstr "关闭"
 msgid "Do you want to open support page?"
 msgstr ""
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "讯息"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -3463,9 +3457,8 @@ msgstr "地图演员数:"
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:73
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:233
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#, fuzzy
 msgid "Map atlas count:"
-msgstr "地图演员数:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:76
@@ -3786,9 +3779,8 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "工会会长: %s"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
@@ -6252,7 +6244,7 @@ msgstr "电子邮件地址不匹配."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6341,7 +6333,7 @@ msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -6390,12 +6382,10 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
+msgid "H"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
@@ -6404,17 +6394,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -6455,9 +6445,8 @@ msgstr "开始"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "切换登陆"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6700,6 +6689,11 @@ msgstr ""
 msgid "Equip"
 msgstr "装备"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7254,9 +7248,8 @@ msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:140
-#, fuzzy
 msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
-msgstr "选择你的服务器***安全模式***"
+msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
 #: src/gui/windows/serverdialog.cpp:150
@@ -7720,27 +7713,27 @@ msgid "Connecting..."
 msgstr "连接中..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "已完成"
 
@@ -9720,9 +9713,8 @@ msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:80
-#, fuzzy
 msgid "Enter pincode"
-msgstr "输入密码:"
+msgstr ""
 
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
@@ -9737,9 +9729,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "更改地图浏览模式"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11424,3 +11415,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Message"
+#~ msgstr "讯息"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0ab84284f..8adf671c7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-23 04:44+0300\n"
-"PO-Revision-Date: 2018-03-02 14:58+0000\n"
-"Last-Translator: Pak Long Wu <paklongwu1006@gmail.com>\n"
+"POT-Creation-Date: 2018-06-30 22:45+0300\n"
+"PO-Revision-Date: 2018-05-23 02:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
 "Language: zh_HK\n"
@@ -800,8 +800,8 @@ msgstr "暫離鍵盤"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
-#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -810,7 +810,7 @@ msgstr "暫離鍵盤"
 #: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charcreatedialog.cpp:508
 #: src/gui/windows/charselectdialog.cpp:281
 #: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
 #: src/gui/windows/editserverdialog.cpp:66
@@ -871,34 +871,27 @@ msgstr "關閉"
 msgid "Do you want to open support page?"
 msgstr "你想打開幫助頁面嗎?"
 
-#. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
-#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
-msgid "Message"
-msgstr "訊息"
-
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/dialogsmanager.cpp:151 src/gui/dialogsmanager.cpp:165
 #: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "復活"
 
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:154
-#, fuzzy
+#: src/gui/dialogsmanager.cpp:153
 msgid "GM revive"
-msgstr "復活"
+msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:201
+#: src/gui/dialogsmanager.cpp:198
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您在攜帶超過體重一半的物品.你將無法回復生命值."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:221
+#: src/gui/dialogsmanager.cpp:217
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 
@@ -3780,15 +3773,13 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-#, fuzzy
 msgid "Guild message sound"
-msgstr "公會成員"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-#, fuzzy
 msgid "Party message sound"
-msgstr "隊伍成員"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
@@ -6247,7 +6238,7 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charcreatedialog.cpp:504
 #: src/gui/windows/charselectdialog.cpp:326
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
@@ -6336,7 +6327,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:633
+#: src/gui/windows/charcreatedialog.cpp:632
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
@@ -6385,12 +6376,10 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#. TRANSLATORS: one char size other character gender
-#. TRANSLATORS: inventory outfits button
+#. TRANSLATORS: one char size hidden character gender
 #: src/gui/windows/charcreatedialog.cpp:293
 #: src/gui/windows/charcreatedialog.cpp:310
-#: src/gui/windows/inventorywindow.cpp:236
-msgid "O"
+msgid "H"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
@@ -6399,17 +6388,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:506
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:623
+#: src/gui/windows/charcreatedialog.cpp:622
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:639
+#: src/gui/windows/charcreatedialog.cpp:638
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -6450,9 +6439,8 @@ msgstr "開始"
 
 #. TRANSLATORS: change pincode button
 #: src/gui/windows/charselectdialog.cpp:128
-#, fuzzy
 msgid "Change pin"
-msgstr "更改"
+msgstr ""
 
 #. TRANSLATORS: char select dialog name
 #: src/gui/windows/charselectdialog.cpp:165
@@ -6695,6 +6683,11 @@ msgstr ""
 msgid "Equip"
 msgstr "裝備"
 
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:236
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
@@ -7714,27 +7707,27 @@ msgid "Connecting..."
 msgstr "連線中..."
 
 #. TRANSLATORS: updater window checkbox
-#: src/gui/windows/updaterwindow.cpp:419
+#: src/gui/windows/updaterwindow.cpp:420
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:863
+#: src/gui/windows/updaterwindow.cpp:864
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:866
+#: src/gui/windows/updaterwindow.cpp:867
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:869
+#: src/gui/windows/updaterwindow.cpp:870
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1058
+#: src/gui/windows/updaterwindow.cpp:1059
 msgid "Completed"
 msgstr "已完成"
 
@@ -9728,9 +9721,8 @@ msgstr ""
 #. TRANSLATORS: dialog caption
 #: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
 #: src/pincodemanager.cpp:185
-#, fuzzy
 msgid "Change pincode"
-msgstr "更改公會職位"
+msgstr ""
 
 #. TRANSLATORS: dialog label
 #: src/pincodemanager.cpp:107
@@ -11415,3 +11407,6 @@ msgstr "%d 秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
+
+#~ msgid "Message"
+#~ msgstr "訊息"